rpms/VirtualBox-kmod/F-19 VirtualBox-kmod.spec,1.49,1.50
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19455
Modified Files:
VirtualBox-kmod.spec
Log Message:
* Sat Nov 30 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.4-1
- New upstream release and build akmods.
Index: VirtualBox-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-kmod/F-19/VirtualBox-kmod.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- VirtualBox-kmod.spec 30 Nov 2013 16:55:07 -0000 1.49
+++ VirtualBox-kmod.spec 30 Nov 2013 18:37:21 -0000 1.50
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels newest
+#global buildforkernels newest
# In prerelease builds (such as betas), this package has the same
# major version number, while the kernel module abi is not guarranteed
@@ -99,7 +99,7 @@
%changelog
* Sat Nov 30 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.4-1
-- New upstream release.
+- New upstream release and build akmods.
* Thu Nov 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3.2-1.5
- Rebuilt for kernel
10 years, 12 months
rpms/VirtualBox-kmod/F-19 VirtualBox-kmod.spec,1.48,1.49
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17247
Modified Files:
VirtualBox-kmod.spec
Log Message:
* Sat Nov 30 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.4-1
- New upstream release.
Index: VirtualBox-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-kmod/F-19/VirtualBox-kmod.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- VirtualBox-kmod.spec 21 Nov 2013 22:40:15 -0000 1.48
+++ VirtualBox-kmod.spec 30 Nov 2013 16:55:07 -0000 1.49
@@ -19,8 +19,8 @@
%bcond_with hardening
Name: VirtualBox-kmod
-Version: 4.3.2
-Release: 1%{?prerel:.%{prerel}}%{?dist}.5
+Version: 4.3.4
+Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -98,6 +98,9 @@
%changelog
+* Sat Nov 30 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.4-1
+- New upstream release.
+
* Thu Nov 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3.2-1.5
- Rebuilt for kernel
10 years, 12 months
rpms/VirtualBox/F-19 .cvsignore, 1.50, 1.51 VirtualBox.spec, 1.51, 1.52 sources, 1.50, 1.51
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16980
Modified Files:
.cvsignore VirtualBox.spec sources
Log Message:
* Sat Nov 30 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.4-1
- New upstream release, a maintenance release of
VirtualBox 4.3 which improves stability and fixes regressions.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-19/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore 2 Nov 2013 12:01:57 -0000 1.50
+++ .cvsignore 30 Nov 2013 16:48:02 -0000 1.51
@@ -1 +1 @@
-VirtualBox-4.3.2.tar.bz2
+VirtualBox-4.3.4.tar.bz2
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-19/VirtualBox.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- VirtualBox.spec 2 Nov 2013 12:01:57 -0000 1.51
+++ VirtualBox.spec 30 Nov 2013 16:48:02 -0000 1.52
@@ -26,7 +26,7 @@
#endif
Name: VirtualBox
-Version: 4.3.2
+Version: 4.3.4
Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
@@ -627,6 +627,10 @@
%changelog
+* Sat Nov 30 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.4-1
+- New upstream release, a maintenance release of
+VirtualBox 4.3 which improves stability and fixes regressions.
+
* Sat Nov 02 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.2-1
- New upstream release, bugfix release.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-19/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources 2 Nov 2013 12:01:57 -0000 1.50
+++ sources 30 Nov 2013 16:48:02 -0000 1.51
@@ -1 +1 @@
-bf986354bf7ee3b2e0251af821b33d7c VirtualBox-4.3.2.tar.bz2
+065c713bb691929179f1649d5118a340 VirtualBox-4.3.4.tar.bz2
10 years, 12 months
rpms/buildsys-build-rpmfusion/F-19 buildsys-build-rpmfusion-kerneldevpkgs-current, 1.52, 1.53 buildsys-build-rpmfusion.spec, 1.75, 1.76
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14653
Modified Files:
buildsys-build-rpmfusion-kerneldevpkgs-current
buildsys-build-rpmfusion.spec
Log Message:
* Sat Nov 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 10:19-35
- rebuild for kernel 3.11.9-200.fc19
Index: buildsys-build-rpmfusion-kerneldevpkgs-current
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-19/buildsys-build-rpmfusion-kerneldevpkgs-current,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- buildsys-build-rpmfusion-kerneldevpkgs-current 30 Nov 2013 14:36:09 -0000 1.52
+++ buildsys-build-rpmfusion-kerneldevpkgs-current 30 Nov 2013 14:39:37 -0000 1.53
@@ -1,4 +1,4 @@
-3.10.10-200.fc19
-3.10.10-200.fc19smp
-3.10.10-200.fc19PAE
-3.10.10-200.fc19lpae
+3.11.9-200.fc19
+3.11.9-200.fc19smp
+3.11.9-200.fc19PAE
+3.11.9-200.fc19lpae
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-19/buildsys-build-rpmfusion.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- buildsys-build-rpmfusion.spec 30 Nov 2013 14:36:09 -0000 1.75
+++ buildsys-build-rpmfusion.spec 30 Nov 2013 14:39:37 -0000 1.76
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 19
-Release: 34_arm
+Release: 35
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -86,6 +86,9 @@
%changelog
+* Sat Nov 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 10:19-35
+- rebuild for kernel 3.11.9-200.fc19
+
* Sat Nov 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 10:19-34_arm
- rebuild for kernel 3.10.10-200.fc19
10 years, 12 months
rpms/buildsys-build-rpmfusion/F-19 buildsys-build-rpmfusion-kerneldevpkgs-current, 1.51, 1.52 buildsys-build-rpmfusion.spec, 1.74, 1.75
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14483
Modified Files:
buildsys-build-rpmfusion-kerneldevpkgs-current
buildsys-build-rpmfusion.spec
Log Message:
* Sat Nov 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 10:19-34_arm
- rebuild for kernel 3.10.10-200.fc19
Index: buildsys-build-rpmfusion-kerneldevpkgs-current
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-19/buildsys-build-rpmfusion-kerneldevpkgs-current,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- buildsys-build-rpmfusion-kerneldevpkgs-current 21 Nov 2013 22:24:09 -0000 1.51
+++ buildsys-build-rpmfusion-kerneldevpkgs-current 30 Nov 2013 14:36:09 -0000 1.52
@@ -1,4 +1,4 @@
-3.11.9-200.fc19
-3.11.9-200.fc19smp
-3.11.9-200.fc19PAE
-3.11.9-200.fc19lpae
+3.10.10-200.fc19
+3.10.10-200.fc19smp
+3.10.10-200.fc19PAE
+3.10.10-200.fc19lpae
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-19/buildsys-build-rpmfusion.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- buildsys-build-rpmfusion.spec 21 Nov 2013 22:24:09 -0000 1.74
+++ buildsys-build-rpmfusion.spec 30 Nov 2013 14:36:09 -0000 1.75
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 19
-Release: 33
+Release: 34_arm
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -86,6 +86,9 @@
%changelog
+* Sat Nov 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 10:19-34_arm
+- rebuild for kernel 3.10.10-200.fc19
+
* Thu Nov 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 10:19-33
- rebuild for kernel 3.11.9-200.fc19
10 years, 12 months
rpms/VirtualBox-kmod/devel VirtualBox-kmod.spec,1.22,1.23
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12692
Modified Files:
VirtualBox-kmod.spec
Log Message:
* Sat Nov 30 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.4-1
- New upstream release.
Index: VirtualBox-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-kmod/devel/VirtualBox-kmod.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- VirtualBox-kmod.spec 2 Nov 2013 13:59:51 -0000 1.22
+++ VirtualBox-kmod.spec 30 Nov 2013 13:00:50 -0000 1.23
@@ -19,7 +19,7 @@
%bcond_with hardening
Name: VirtualBox-kmod
-Version: 4.3.2
+Version: 4.3.4
Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: Kernel module for VirtualBox
@@ -98,6 +98,9 @@
%changelog
+* Sat Nov 30 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.4-1
+- New upstream release.
+
* Sat Nov 02 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.2-1
- New upstream release.
10 years, 12 months
rpms/VirtualBox/devel .cvsignore, 1.50, 1.51 VirtualBox.spec, 1.52, 1.53 sources, 1.50, 1.51
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10529
Modified Files:
.cvsignore VirtualBox.spec sources
Log Message:
* Sat Nov 30 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.4-1
- New upstream release, a maintenance release of
VirtualBox 4.3 which improves stability and fixes regressions.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore 2 Nov 2013 11:32:26 -0000 1.50
+++ .cvsignore 30 Nov 2013 11:02:14 -0000 1.51
@@ -1 +1 @@
-VirtualBox-4.3.2.tar.bz2
+VirtualBox-4.3.4.tar.bz2
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- VirtualBox.spec 2 Nov 2013 11:32:26 -0000 1.52
+++ VirtualBox.spec 30 Nov 2013 11:02:14 -0000 1.53
@@ -26,7 +26,7 @@
#endif
Name: VirtualBox
-Version: 4.3.2
+Version: 4.3.4
Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
@@ -627,6 +627,10 @@
%changelog
+* Sat Nov 30 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.4-1
+- New upstream release, a maintenance release of
+VirtualBox 4.3 which improves stability and fixes regressions.
+
* Sat Nov 02 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.2-1
- New upstream release, bugfix release.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources 2 Nov 2013 11:32:26 -0000 1.50
+++ sources 30 Nov 2013 11:02:14 -0000 1.51
@@ -1 +1 @@
-bf986354bf7ee3b2e0251af821b33d7c VirtualBox-4.3.2.tar.bz2
+065c713bb691929179f1649d5118a340 VirtualBox-4.3.4.tar.bz2
10 years, 12 months
rpms/openafs/F-18 openafs-1.6.6-systemd-env-vars.patch, NONE, 1.1 openafs-1.6.6-systemd-execpoststart.patch, NONE, 1.1 openafs-1.6.6-systemd-fhs.patch, NONE, 1.1 openafs-1.6.6-systemd-kmod-name.patch, NONE, 1.1 openafs-1.6.6-systemd-no-cellservdb.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 openafs.spec, 1.38, 1.39 sources, 1.19, 1.20 openafs-1.6.1-systemd-env-vars.patch, 1.1, NONE openafs-1.6.1-systemd-execpoststart.patch, 1.2, NONE openafs-1.6.1-systemd-fhs.patch, 1.2, NONE openafs-1.6.1-systemd-kmod-name.patc
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18121
Modified Files:
.cvsignore openafs.spec sources
Added Files:
openafs-1.6.6-systemd-env-vars.patch
openafs-1.6.6-systemd-execpoststart.patch
openafs-1.6.6-systemd-fhs.patch
openafs-1.6.6-systemd-kmod-name.patch
openafs-1.6.6-systemd-no-cellservdb.patch
Removed Files:
openafs-1.6.1-systemd-env-vars.patch
openafs-1.6.1-systemd-execpoststart.patch
openafs-1.6.1-systemd-fhs.patch
openafs-1.6.1-systemd-kmod-name.patch
openafs-1.6.1-systemd-no-cellservdb.patch
Log Message:
* Sat Nov 30 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.6-0.pre1
- Update to OpenAFS 1.6.6pre1
- Rebase systemd patches to 1.6.6
openafs-1.6.6-systemd-env-vars.patch:
openafs-client.service | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE openafs-1.6.6-systemd-env-vars.patch ---
>From 744d9017d28a50b9f9956c245dcdd03bbb49b4ef Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer(a)ktdreyer.com>
Date: Mon, 8 Oct 2012 20:59:43 -0600
Subject: [PATCH 4/5] systemd: add more environment variables to
openafs-client.service
At the risk of deviating too far from upstream, this permits a few more
user-friendly environment variables in /etc/sysconfig/openafs.
Change-Id: Ib0938b2865005fc1f1b1c49dfda0d4bf92957004
---
src/packaging/RedHat/openafs-client.service | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/packaging/RedHat/openafs-client.service b/src/packaging/RedHat/openafs-client.service
index 89a344f..719aed77 100644
--- a/src/packaging/RedHat/openafs-client.service
+++ b/src/packaging/RedHat/openafs-client.service
@@ -6,7 +6,7 @@ After=syslog.target network.target
Type=forking
EnvironmentFile=/etc/sysconfig/openafs
ExecStartPre=/sbin/modprobe openafs
-ExecStart=/usr/sbin/afsd $AFSD_ARGS
+ExecStart=/usr/sbin/afsd $AFSD_ARGS $CACHE $OPTIONS $CONFDIR
ExecStop=/bin/umount /afs
ExecStop=/usr/sbin/afsd -shutdown
ExecStop=/sbin/rmmod libafs
--
1.8.3.1
openafs-1.6.6-systemd-execpoststart.patch:
openafs-client.service | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE openafs-1.6.6-systemd-execpoststart.patch ---
>From 67f731fa7b2abee3b7a2a2be24d2f9b566946263 Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer(a)ktdreyer.com>
Date: Mon, 8 Oct 2012 21:01:52 -0600
Subject: [PATCH 5/5] systemd: run "sysnames" script after starting afsd
This helper script will set any custom sysnames on the client.
Change-Id: Ibdb770fac20eb26b137bd02a71a52e0c801b039d
---
src/packaging/RedHat/openafs-client.service | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/packaging/RedHat/openafs-client.service b/src/packaging/RedHat/openafs-client.service
index 719aed77..aac1ca7 100644
--- a/src/packaging/RedHat/openafs-client.service
+++ b/src/packaging/RedHat/openafs-client.service
@@ -7,6 +7,7 @@ Type=forking
EnvironmentFile=/etc/sysconfig/openafs
ExecStartPre=/sbin/modprobe openafs
ExecStart=/usr/sbin/afsd $AFSD_ARGS $CACHE $OPTIONS $CONFDIR
+ExecStartPost=/usr/libexec/openafs/sysnames
ExecStop=/bin/umount /afs
ExecStop=/usr/sbin/afsd -shutdown
ExecStop=/sbin/rmmod libafs
--
1.8.3.1
openafs-1.6.6-systemd-fhs.patch:
openafs-client.service | 4 ++--
openafs-server.service | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
--- NEW FILE openafs-1.6.6-systemd-fhs.patch ---
>From 742dce0406b45643f29bae44c4cb7c51f58e4fbd Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer(a)ktdreyer.com>
Date: Mon, 8 Oct 2012 20:58:13 -0600
Subject: [PATCH 3/5] systemd: use FHS-style paths
The unit files from openafs.org still refer to the old transarc paths.
Replace them with FHS-compliant paths.
Change-Id: Iff326d082a00e3632ff7a8c9983fbf277ce6b4eb
---
src/packaging/RedHat/openafs-client.service | 4 ++--
src/packaging/RedHat/openafs-server.service | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/packaging/RedHat/openafs-client.service b/src/packaging/RedHat/openafs-client.service
index a5fb287..89a344f 100644
--- a/src/packaging/RedHat/openafs-client.service
+++ b/src/packaging/RedHat/openafs-client.service
@@ -6,9 +6,9 @@ After=syslog.target network.target
Type=forking
EnvironmentFile=/etc/sysconfig/openafs
ExecStartPre=/sbin/modprobe openafs
-ExecStart=/usr/vice/etc/afsd $AFSD_ARGS
+ExecStart=/usr/sbin/afsd $AFSD_ARGS
ExecStop=/bin/umount /afs
-ExecStop=/usr/vice/etc/afsd -shutdown
+ExecStop=/usr/sbin/afsd -shutdown
ExecStop=/sbin/rmmod libafs
KillMode=none
diff --git a/src/packaging/RedHat/openafs-server.service b/src/packaging/RedHat/openafs-server.service
index ac9d3c4..d8904bf 100644
--- a/src/packaging/RedHat/openafs-server.service
+++ b/src/packaging/RedHat/openafs-server.service
@@ -4,7 +4,7 @@ After=syslog.target network.target
[Service]
EnvironmentFile=-/etc/sysconfig/openafs
-ExecStart=/usr/afs/bin/bosserver -nofork $BOSSERVER_ARGS
+ExecStart=/usr/sbin/bosserver -nofork $BOSSERVER_ARGS
ExecStop=/usr/bin/bos shutdown localhost -wait -localauth
[Install]
--
1.8.3.1
openafs-1.6.6-systemd-kmod-name.patch:
openafs-client.service | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE openafs-1.6.6-systemd-kmod-name.patch ---
>From f894b6988496f305f9ec41a01e523b2c8632810c Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer(a)ktdreyer.com>
Date: Mon, 8 Oct 2012 20:55:50 -0600
Subject: [PATCH 2/5] systemd: unload module "libafs"
Load the module as "openafs", but unload it using the name "libafs".
Change-Id: Ib7d3d9b80ff58e9cded9a3171a5b003f1995a5b7
---
src/packaging/RedHat/openafs-client.service | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/packaging/RedHat/openafs-client.service b/src/packaging/RedHat/openafs-client.service
index 2ee652a..a5fb287 100644
--- a/src/packaging/RedHat/openafs-client.service
+++ b/src/packaging/RedHat/openafs-client.service
@@ -9,7 +9,7 @@ ExecStartPre=/sbin/modprobe openafs
ExecStart=/usr/vice/etc/afsd $AFSD_ARGS
ExecStop=/bin/umount /afs
ExecStop=/usr/vice/etc/afsd -shutdown
-ExecStop=/sbin/rmmod openafs
+ExecStop=/sbin/rmmod libafs
KillMode=none
[Install]
--
1.8.3.1
openafs-1.6.6-systemd-no-cellservdb.patch:
openafs-client.service | 3 ---
1 file changed, 3 deletions(-)
--- NEW FILE openafs-1.6.6-systemd-no-cellservdb.patch ---
>From 11884d0f9747ea89c1d77fa12c90f174ff4e60c0 Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer(a)ktdreyer.com>
Date: Mon, 8 Oct 2012 20:55:12 -0600
Subject: [PATCH 1/5] systemd: skip CellServDB manipulation
Change-Id: I23544f183c0423b208b6465c8d7184d64b6b4a15
---
src/packaging/RedHat/openafs-client.service | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/packaging/RedHat/openafs-client.service b/src/packaging/RedHat/openafs-client.service
index 936762e..2ee652a 100644
--- a/src/packaging/RedHat/openafs-client.service
+++ b/src/packaging/RedHat/openafs-client.service
@@ -5,8 +5,6 @@ After=syslog.target network.target
[Service]
Type=forking
EnvironmentFile=/etc/sysconfig/openafs
-ExecStartPre=/bin/sed -n 'w/usr/vice/etc/CellServDB' /usr/vice/etc/CellServDB.local /usr/vice/etc/CellServDB.dist
-ExecStartPre=/bin/chmod 0644 /usr/vice/etc/CellServDB
ExecStartPre=/sbin/modprobe openafs
ExecStart=/usr/vice/etc/afsd $AFSD_ARGS
ExecStop=/bin/umount /afs
--
1.8.3.1
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/openafs/F-18/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 24 Jul 2013 15:08:36 -0000 1.14
+++ .cvsignore 30 Nov 2013 03:51:03 -0000 1.15
@@ -1,2 +1,2 @@
-openafs-1.6.5-src.tar.bz2
-openafs-1.6.5-doc.tar.bz2
+openafs-1.6.6pre1-src.tar.bz2
+openafs-1.6.6pre1-doc.tar.bz2
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/F-18/openafs.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- openafs.spec 24 Jul 2013 15:08:37 -0000 1.38
+++ openafs.spec 30 Nov 2013 03:51:03 -0000 1.39
@@ -10,6 +10,8 @@
%define sysname amd64_linux26
%endif
+%define pre pre1
+
# Use systemd unit files on Fedora 18 and above.
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
%global _with_systemd 1
@@ -18,13 +20,13 @@
Summary: Enterprise Network File System
Name: openafs
-Version: 1.6.5
-Release: 1%{?dist}
+Version: 1.6.6
+Release: 0.%{pre}%{?dist}
License: IBM
Group: System Environment/Daemons
URL: http://www.openafs.org
-Source0: http://dl.openafs.org/dl/%{version}/%{name}-%{version}-src.tar.bz2
-Source1: http://dl.openafs.org/dl/%{version}/%{name}-%{version}-doc.tar.bz2
+Source0: http://dl.openafs.org/dl/candidate/%{version}%{pre}/%{name}-%{version}%{p...
+Source1: http://dl.openafs.org/dl/candidate/%{version}%{pre}/%{name}-%{version}%{p...
Source11: http://grand.central.org/dl/cellservdb/CellServDB
Source12: cacheinfo
Source13: openafs.init
@@ -47,15 +49,15 @@
Patch0: openafs-1.6.0-fPIC.patch
# systemd: Skip CellServDB manipulation
-Patch1: openafs-1.6.1-systemd-no-cellservdb.patch
+Patch1: openafs-1.6.6-systemd-no-cellservdb.patch
# systemd: unload the proper kernel module
-Patch2: openafs-1.6.1-systemd-kmod-name.patch
+Patch2: openafs-1.6.6-systemd-kmod-name.patch
# systemd: use FHS-style paths instead of transarc paths
-Patch3: openafs-1.6.1-systemd-fhs.patch
+Patch3: openafs-1.6.6-systemd-fhs.patch
# systemd: add additional user-friendly environment vars
-Patch4: openafs-1.6.1-systemd-env-vars.patch
+Patch4: openafs-1.6.6-systemd-env-vars.patch
# Add ExecPostStart "sysnames" helper script.
-Patch5: openafs-1.6.1-systemd-execpoststart.patch
+Patch5: openafs-1.6.6-systemd-execpoststart.patch
%description
@@ -131,7 +133,7 @@
Cell.
%prep
-%setup -q -b 1 -n openafs-%{version}
+%setup -q -b 1 -n openafs-%{version}%{pre}
# This changes osconf.m4 to build with -fPIC on i386 and x86_64
%patch0
@@ -362,10 +364,10 @@
%{_bindir}/restorevol
%{_bindir}/tokens
%{_bindir}/tokens.krb
+%{_bindir}/translate_et
%{_bindir}/udebug
%{_bindir}/unlog
%{_bindir}/up
-%{_bindir}/translate_et
%{_sbindir}/afsbackup
%{_sbindir}/butc
%{_sbindir}/fstrace
@@ -432,8 +434,8 @@
%{_sbindir}/vlclient
%{_sbindir}/vldb_check
%{_sbindir}/vldb_convert
-%{_sbindir}/volinfo
%{_sbindir}/voldump
+%{_sbindir}/volinfo
%{_sbindir}/bos_util
%{_sbindir}/kadb_check
%{_sbindir}/ka-forwarder
@@ -443,8 +445,8 @@
%files devel
%defattr(-,root,root)
-%{_bindir}/rxgen
%{_bindir}/afs_compile_et
+%{_bindir}/rxgen
%{_includedir}/afs
%{_includedir}/rx
%{_includedir}/*.h
@@ -457,6 +459,13 @@
%{_datadir}/openafs/C/afszcm.cat
%changelog
+* Sat Nov 30 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.6-0.pre1
+- Update to OpenAFS 1.6.6pre1
+- Rebase systemd patches to 1.6.6
+
+* Fri Oct 11 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.5.1-1
+- Update to OpenAFS 1.6.5.1
+
* Wed Jul 24 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.5-1
- Update to OpenAFS 1.6.5
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs/F-18/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 24 Jul 2013 15:08:37 -0000 1.19
+++ sources 30 Nov 2013 03:51:03 -0000 1.20
@@ -1,2 +1,2 @@
-e33e0b031760d4f90815d40b8ab3c540 openafs-1.6.5-src.tar.bz2
-3a391eb7932a841818f95c3d27f1bebc openafs-1.6.5-doc.tar.bz2
+c771d56cfddf5fe5ac00e610c2b47613 openafs-1.6.6pre1-src.tar.bz2
+ad98010dfca94b4c72a77f4db2046f26 openafs-1.6.6pre1-doc.tar.bz2
--- openafs-1.6.1-systemd-env-vars.patch DELETED ---
--- openafs-1.6.1-systemd-execpoststart.patch DELETED ---
--- openafs-1.6.1-systemd-fhs.patch DELETED ---
--- openafs-1.6.1-systemd-kmod-name.patch DELETED ---
--- openafs-1.6.1-systemd-no-cellservdb.patch DELETED ---
10 years, 12 months
rpms/openafs-kmod/F-18 .cvsignore, 1.15, 1.16 openafs-kmod.spec, 1.85, 1.86 sources, 1.19, 1.20
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17305
Modified Files:
.cvsignore openafs-kmod.spec sources
Log Message:
* Sat Nov 30 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.6-0.pre1
- Update to OpenAFS 1.6.6pre1
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-18/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 24 Jul 2013 15:10:59 -0000 1.15
+++ .cvsignore 30 Nov 2013 03:39:10 -0000 1.16
@@ -1 +1 @@
-openafs-1.6.5-src.tar.bz2
+openafs-1.6.6pre1-src.tar.bz2
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-18/openafs-kmod.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- openafs-kmod.spec 21 Nov 2013 22:41:20 -0000 1.85
+++ openafs-kmod.spec 30 Nov 2013 03:39:10 -0000 1.86
@@ -15,20 +15,22 @@
%define sysname amd64_linux26
%endif
+%define pre pre1
+
%define kmod_name openafs
# name should have a -kmod suffix
Name: %{kmod_name}-kmod
-Version: 1.6.5
-Release: 1%{?dist}.15
+Version: 1.6.6
+Release: 0.%{pre}%{?dist}
Summary: Kernel module(s)
Group: System Environment/Kernel
License: IBM
URL: http://www.openafs.org
-Source0: http://dl.openafs.org/dl/%{version}/%{kmod_name}-%{version}-src.tar.bz2
+Source0: http://dl.openafs.org/dl/candidate/%{version}%{pre}/%{kmod_name}-%{versio...
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -58,12 +60,12 @@
%setup -q -c -T -a 0
# apply patches and do other stuff here
-pushd %{kmod_name}-%{version}
+pushd %{kmod_name}-%{version}%{pre}
./regen.sh
popd
for kernel_version in %{?kernel_versions} ; do
- cp -a %{kmod_name}-%{version} _kmod_build_${kernel_version%%___*}
+ cp -a %{kmod_name}-%{version}%{pre} _kmod_build_${kernel_version%%___*}
done
@@ -97,130 +99,25 @@
%changelog
-* Thu Nov 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.5-1.15
-- Rebuilt for kernel
-
-* Thu Nov 14 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.5-1.14
-- Rebuilt for kernel
-
-* Mon Nov 04 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.5-1.13
-- Rebuilt for kernel
-
-* Tue Oct 22 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.5-1.12
-- Rebuilt for kernel
-
-* Mon Oct 14 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.5-1.11
-- Rebuilt for kernel
-
-* Fri Oct 11 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.5-1.10
-- Rebuilt for kernel
-
-* Sat Oct 05 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.5-1.9
-- Rebuilt for kernel
-
-* Tue Oct 01 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.5-1.8
-- Rebuilt for kernel
-
-* Sun Sep 29 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.5-1.7
-- Rebuilt for kernel
+* Sat Nov 30 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.6-0.pre1
+- Update to OpenAFS 1.6.6pre1
-* Sun Sep 29 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.5-1.6
-- Rebuilt for kernel
-
-* Sat Aug 31 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.5-1.5
-- Rebuilt for kernel
-
-* Thu Aug 22 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.5-1.4
-- Rebuilt for kernel
-
-* Fri Aug 16 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.5-1.3
-- Rebuilt for kernel
-
-* Tue Aug 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.5-1.2
-- Rebuilt for kernel
-
-* Sat Aug 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.5-1.1
-- Rebuilt for kernel
+* Fri Oct 11 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.5.1-1
+- Update to OpenAFS 1.6.5.1
* Wed Jul 24 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.5-1
- Update to OpenAFS 1.6.5
-* Tue Jul 23 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.4-1.3
-- Rebuilt for kernel
-
-* Mon Jul 15 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.4-1.2
-- Rebuilt for kernel
-
-* Sat Jul 06 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.4-1.1
-- Rebuilt for kernel
-
* Thu Jul 04 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.4-1
- Update to OpenAFS 1.6.4
-* Sun Jun 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.2.1-1.7
-- Rebuilt for kernel
-
-* Mon Jun 17 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.2.1-1.6
-- Rebuilt for kernel
-
-* Wed Jun 12 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.2.1-1.5
-- Rebuilt for kernel
-
-* Sat May 25 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.2.1-1.4
-- Rebuilt for kernel
-
-* Wed May 22 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.2.1-1.3
-- Rebuilt for kernel
-
-* Tue May 14 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.2.1-1.2
-- Rebuilt for kernel
-
-* Fri May 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.2.1-1.1
-- Rebuilt for kernel
-
* Tue Apr 30 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.2.1-1
- Update to OpenAFS 1.6.2.1
- Add patches to support kernel 3.9
-* Sun Apr 28 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.2-3.10
-Rebuilt for kernel
-
-* Thu Apr 25 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.2-3.9
-- Rebuilt for kernel
-
-* Thu Apr 18 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.2-3.8
-- Rebuilt for kernel
-
-* Sat Apr 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.2-3.7
-- Rebuilt for kernel
-
-* Wed Apr 10 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.2-3.6
-- Rebuilt for kernel
-
-* Tue Apr 02 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.2-3.5
-- Rebuilt for kernel
-
-* Fri Mar 22 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.2-3.4
-- Rebuilt for kernel
-
-* Mon Mar 18 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.2-3.3
-- Rebuilt for kernel
-
-* Fri Mar 15 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.2-3.2
-- Rebuilt for kernel
-
-* Sun Mar 10 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.2-3.1
-Rebuilt for kernel
-
* Sat Mar 02 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.2-3
- Add patches to support kernel 3.8
-* Thu Feb 28 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.2-2.2
-- Rebuilt for kernel
-
-* Tue Feb 26 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.2-2.1
-- Rebuilt for kernel
-
* Thu Feb 21 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.2-2
- Use newer tarball for 1.6.2 final
@@ -252,7 +149,7 @@
* Wed Mar 07 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.1-0.pre4
- Update to OpenAFS 1.6.1 pre-release 4
-* Wed Feb 28 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.1-0.pre3
+* Tue Feb 28 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.1-0.pre3
- Update to OpenAFS 1.6.1 pre-release 3
* Wed Feb 08 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.1-0.pre2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-18/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 24 Jul 2013 15:10:59 -0000 1.19
+++ sources 30 Nov 2013 03:39:10 -0000 1.20
@@ -1 +1 @@
-e33e0b031760d4f90815d40b8ab3c540 openafs-1.6.5-src.tar.bz2
+c771d56cfddf5fe5ac00e610c2b47613 openafs-1.6.6pre1-src.tar.bz2
10 years, 12 months
rpms/openafs/F-19 openafs-1.6.6-systemd-env-vars.patch, NONE, 1.1 openafs-1.6.6-systemd-execpoststart.patch, NONE, 1.1 openafs-1.6.6-systemd-fhs.patch, NONE, 1.1 openafs-1.6.6-systemd-kmod-name.patch, NONE, 1.1 openafs-1.6.6-systemd-no-cellservdb.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 openafs.spec, 1.42, 1.43 sources, 1.20, 1.21 openafs-1.6.1-systemd-env-vars.patch, 1.1, NONE openafs-1.6.1-systemd-execpoststart.patch, 1.2, NONE openafs-1.6.1-systemd-fhs.patch, 1.2, NONE openafs-1.6.1-systemd-kmod-name.patc
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15013
Modified Files:
.cvsignore openafs.spec sources
Added Files:
openafs-1.6.6-systemd-env-vars.patch
openafs-1.6.6-systemd-execpoststart.patch
openafs-1.6.6-systemd-fhs.patch
openafs-1.6.6-systemd-kmod-name.patch
openafs-1.6.6-systemd-no-cellservdb.patch
Removed Files:
openafs-1.6.1-systemd-env-vars.patch
openafs-1.6.1-systemd-execpoststart.patch
openafs-1.6.1-systemd-fhs.patch
openafs-1.6.1-systemd-kmod-name.patch
openafs-1.6.1-systemd-no-cellservdb.patch
Log Message:
* Sat Nov 30 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.6-0.pre1
- Update to OpenAFS 1.6.6pre1
- Rebase systemd patches to 1.6.6
openafs-1.6.6-systemd-env-vars.patch:
openafs-client.service | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE openafs-1.6.6-systemd-env-vars.patch ---
>From 744d9017d28a50b9f9956c245dcdd03bbb49b4ef Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer(a)ktdreyer.com>
Date: Mon, 8 Oct 2012 20:59:43 -0600
Subject: [PATCH 4/5] systemd: add more environment variables to
openafs-client.service
At the risk of deviating too far from upstream, this permits a few more
user-friendly environment variables in /etc/sysconfig/openafs.
Change-Id: Ib0938b2865005fc1f1b1c49dfda0d4bf92957004
---
src/packaging/RedHat/openafs-client.service | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/packaging/RedHat/openafs-client.service b/src/packaging/RedHat/openafs-client.service
index 89a344f..719aed77 100644
--- a/src/packaging/RedHat/openafs-client.service
+++ b/src/packaging/RedHat/openafs-client.service
@@ -6,7 +6,7 @@ After=syslog.target network.target
Type=forking
EnvironmentFile=/etc/sysconfig/openafs
ExecStartPre=/sbin/modprobe openafs
-ExecStart=/usr/sbin/afsd $AFSD_ARGS
+ExecStart=/usr/sbin/afsd $AFSD_ARGS $CACHE $OPTIONS $CONFDIR
ExecStop=/bin/umount /afs
ExecStop=/usr/sbin/afsd -shutdown
ExecStop=/sbin/rmmod libafs
--
1.8.3.1
openafs-1.6.6-systemd-execpoststart.patch:
openafs-client.service | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE openafs-1.6.6-systemd-execpoststart.patch ---
>From 67f731fa7b2abee3b7a2a2be24d2f9b566946263 Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer(a)ktdreyer.com>
Date: Mon, 8 Oct 2012 21:01:52 -0600
Subject: [PATCH 5/5] systemd: run "sysnames" script after starting afsd
This helper script will set any custom sysnames on the client.
Change-Id: Ibdb770fac20eb26b137bd02a71a52e0c801b039d
---
src/packaging/RedHat/openafs-client.service | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/packaging/RedHat/openafs-client.service b/src/packaging/RedHat/openafs-client.service
index 719aed77..aac1ca7 100644
--- a/src/packaging/RedHat/openafs-client.service
+++ b/src/packaging/RedHat/openafs-client.service
@@ -7,6 +7,7 @@ Type=forking
EnvironmentFile=/etc/sysconfig/openafs
ExecStartPre=/sbin/modprobe openafs
ExecStart=/usr/sbin/afsd $AFSD_ARGS $CACHE $OPTIONS $CONFDIR
+ExecStartPost=/usr/libexec/openafs/sysnames
ExecStop=/bin/umount /afs
ExecStop=/usr/sbin/afsd -shutdown
ExecStop=/sbin/rmmod libafs
--
1.8.3.1
openafs-1.6.6-systemd-fhs.patch:
openafs-client.service | 4 ++--
openafs-server.service | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
--- NEW FILE openafs-1.6.6-systemd-fhs.patch ---
>From 742dce0406b45643f29bae44c4cb7c51f58e4fbd Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer(a)ktdreyer.com>
Date: Mon, 8 Oct 2012 20:58:13 -0600
Subject: [PATCH 3/5] systemd: use FHS-style paths
The unit files from openafs.org still refer to the old transarc paths.
Replace them with FHS-compliant paths.
Change-Id: Iff326d082a00e3632ff7a8c9983fbf277ce6b4eb
---
src/packaging/RedHat/openafs-client.service | 4 ++--
src/packaging/RedHat/openafs-server.service | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/packaging/RedHat/openafs-client.service b/src/packaging/RedHat/openafs-client.service
index a5fb287..89a344f 100644
--- a/src/packaging/RedHat/openafs-client.service
+++ b/src/packaging/RedHat/openafs-client.service
@@ -6,9 +6,9 @@ After=syslog.target network.target
Type=forking
EnvironmentFile=/etc/sysconfig/openafs
ExecStartPre=/sbin/modprobe openafs
-ExecStart=/usr/vice/etc/afsd $AFSD_ARGS
+ExecStart=/usr/sbin/afsd $AFSD_ARGS
ExecStop=/bin/umount /afs
-ExecStop=/usr/vice/etc/afsd -shutdown
+ExecStop=/usr/sbin/afsd -shutdown
ExecStop=/sbin/rmmod libafs
KillMode=none
diff --git a/src/packaging/RedHat/openafs-server.service b/src/packaging/RedHat/openafs-server.service
index ac9d3c4..d8904bf 100644
--- a/src/packaging/RedHat/openafs-server.service
+++ b/src/packaging/RedHat/openafs-server.service
@@ -4,7 +4,7 @@ After=syslog.target network.target
[Service]
EnvironmentFile=-/etc/sysconfig/openafs
-ExecStart=/usr/afs/bin/bosserver -nofork $BOSSERVER_ARGS
+ExecStart=/usr/sbin/bosserver -nofork $BOSSERVER_ARGS
ExecStop=/usr/bin/bos shutdown localhost -wait -localauth
[Install]
--
1.8.3.1
openafs-1.6.6-systemd-kmod-name.patch:
openafs-client.service | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE openafs-1.6.6-systemd-kmod-name.patch ---
>From f894b6988496f305f9ec41a01e523b2c8632810c Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer(a)ktdreyer.com>
Date: Mon, 8 Oct 2012 20:55:50 -0600
Subject: [PATCH 2/5] systemd: unload module "libafs"
Load the module as "openafs", but unload it using the name "libafs".
Change-Id: Ib7d3d9b80ff58e9cded9a3171a5b003f1995a5b7
---
src/packaging/RedHat/openafs-client.service | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/packaging/RedHat/openafs-client.service b/src/packaging/RedHat/openafs-client.service
index 2ee652a..a5fb287 100644
--- a/src/packaging/RedHat/openafs-client.service
+++ b/src/packaging/RedHat/openafs-client.service
@@ -9,7 +9,7 @@ ExecStartPre=/sbin/modprobe openafs
ExecStart=/usr/vice/etc/afsd $AFSD_ARGS
ExecStop=/bin/umount /afs
ExecStop=/usr/vice/etc/afsd -shutdown
-ExecStop=/sbin/rmmod openafs
+ExecStop=/sbin/rmmod libafs
KillMode=none
[Install]
--
1.8.3.1
openafs-1.6.6-systemd-no-cellservdb.patch:
openafs-client.service | 3 ---
1 file changed, 3 deletions(-)
--- NEW FILE openafs-1.6.6-systemd-no-cellservdb.patch ---
>From 11884d0f9747ea89c1d77fa12c90f174ff4e60c0 Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer(a)ktdreyer.com>
Date: Mon, 8 Oct 2012 20:55:12 -0600
Subject: [PATCH 1/5] systemd: skip CellServDB manipulation
Change-Id: I23544f183c0423b208b6465c8d7184d64b6b4a15
---
src/packaging/RedHat/openafs-client.service | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/packaging/RedHat/openafs-client.service b/src/packaging/RedHat/openafs-client.service
index 936762e..2ee652a 100644
--- a/src/packaging/RedHat/openafs-client.service
+++ b/src/packaging/RedHat/openafs-client.service
@@ -5,8 +5,6 @@ After=syslog.target network.target
[Service]
Type=forking
EnvironmentFile=/etc/sysconfig/openafs
-ExecStartPre=/bin/sed -n 'w/usr/vice/etc/CellServDB' /usr/vice/etc/CellServDB.local /usr/vice/etc/CellServDB.dist
-ExecStartPre=/bin/chmod 0644 /usr/vice/etc/CellServDB
ExecStartPre=/sbin/modprobe openafs
ExecStart=/usr/vice/etc/afsd $AFSD_ARGS
ExecStop=/bin/umount /afs
--
1.8.3.1
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/openafs/F-19/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 11 Oct 2013 22:10:37 -0000 1.16
+++ .cvsignore 30 Nov 2013 03:12:03 -0000 1.17
@@ -1,2 +1,2 @@
-openafs-1.6.5.1-src.tar.bz2
-openafs-1.6.5.1-doc.tar.bz2
+openafs-1.6.6pre1-src.tar.bz2
+openafs-1.6.6pre1-doc.tar.bz2
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/F-19/openafs.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- openafs.spec 11 Oct 2013 22:10:37 -0000 1.42
+++ openafs.spec 30 Nov 2013 03:12:04 -0000 1.43
@@ -10,6 +10,8 @@
%define sysname amd64_linux26
%endif
+%define pre pre1
+
# Use systemd unit files on Fedora 18 and above.
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
%global _with_systemd 1
@@ -18,13 +20,13 @@
Summary: Enterprise Network File System
Name: openafs
-Version: 1.6.5.1
-Release: 1%{?dist}
+Version: 1.6.6
+Release: 0.%{pre}%{?dist}
License: IBM
Group: System Environment/Daemons
URL: http://www.openafs.org
-Source0: http://dl.openafs.org/dl/%{version}/%{name}-%{version}-src.tar.bz2
-Source1: http://dl.openafs.org/dl/%{version}/%{name}-%{version}-doc.tar.bz2
+Source0: http://dl.openafs.org/dl/candidate/%{version}%{pre}/%{name}-%{version}%{p...
+Source1: http://dl.openafs.org/dl/candidate/%{version}%{pre}/%{name}-%{version}%{p...
Source11: http://grand.central.org/dl/cellservdb/CellServDB
Source12: cacheinfo
Source13: openafs.init
@@ -47,15 +49,15 @@
Patch0: openafs-1.6.0-fPIC.patch
# systemd: Skip CellServDB manipulation
-Patch1: openafs-1.6.1-systemd-no-cellservdb.patch
+Patch1: openafs-1.6.6-systemd-no-cellservdb.patch
# systemd: unload the proper kernel module
-Patch2: openafs-1.6.1-systemd-kmod-name.patch
+Patch2: openafs-1.6.6-systemd-kmod-name.patch
# systemd: use FHS-style paths instead of transarc paths
-Patch3: openafs-1.6.1-systemd-fhs.patch
+Patch3: openafs-1.6.6-systemd-fhs.patch
# systemd: add additional user-friendly environment vars
-Patch4: openafs-1.6.1-systemd-env-vars.patch
+Patch4: openafs-1.6.6-systemd-env-vars.patch
# Add ExecPostStart "sysnames" helper script.
-Patch5: openafs-1.6.1-systemd-execpoststart.patch
+Patch5: openafs-1.6.6-systemd-execpoststart.patch
%description
@@ -131,7 +133,7 @@
Cell.
%prep
-%setup -q -b 1 -n openafs-%{version}
+%setup -q -b 1 -n openafs-%{version}%{pre}
# This changes osconf.m4 to build with -fPIC on i386 and x86_64
%patch0
@@ -457,6 +459,10 @@
%{_datadir}/openafs/C/afszcm.cat
%changelog
+* Sat Nov 30 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.6-0.pre1
+- Update to OpenAFS 1.6.6pre1
+- Rebase systemd patches to 1.6.6
+
* Fri Oct 11 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.5.1-1
- Update to OpenAFS 1.6.5.1
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs/F-19/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources 11 Oct 2013 22:10:37 -0000 1.20
+++ sources 30 Nov 2013 03:12:04 -0000 1.21
@@ -1,2 +1,2 @@
-70576ac8bd7ae2f8a4d4095fd16a1679 openafs-1.6.5.1-src.tar.bz2
-858abcd44923075630836c0196a2c0bb openafs-1.6.5.1-doc.tar.bz2
+c771d56cfddf5fe5ac00e610c2b47613 openafs-1.6.6pre1-src.tar.bz2
+ad98010dfca94b4c72a77f4db2046f26 openafs-1.6.6pre1-doc.tar.bz2
--- openafs-1.6.1-systemd-env-vars.patch DELETED ---
--- openafs-1.6.1-systemd-execpoststart.patch DELETED ---
--- openafs-1.6.1-systemd-fhs.patch DELETED ---
--- openafs-1.6.1-systemd-kmod-name.patch DELETED ---
--- openafs-1.6.1-systemd-no-cellservdb.patch DELETED ---
10 years, 12 months