rpms/buildsys-build-rpmfusion/F-18 buildsys-build-rpmfusion-kerneldevpkgs-current, 1.33, 1.34 buildsys-build-rpmfusion.spec, 1.48, 1.49
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23847
Modified Files:
buildsys-build-rpmfusion-kerneldevpkgs-current
buildsys-build-rpmfusion.spec
Log Message:
* Fri Jan 25 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 10:18-5
- rebuild for kernel 3.7.4-204.fc18
Index: buildsys-build-rpmfusion-kerneldevpkgs-current
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-18/buildsys-build-rpmfusion-kerneldevpkgs-current,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- buildsys-build-rpmfusion-kerneldevpkgs-current 17 Jan 2013 08:43:46 -0000 1.33
+++ buildsys-build-rpmfusion-kerneldevpkgs-current 25 Jan 2013 18:46:49 -0000 1.34
@@ -1,3 +1,3 @@
-3.7.2-204.fc18
-3.7.2-204.fc18smp
-3.7.2-204.fc18PAE
+3.7.4-204.fc18
+3.7.4-204.fc18smp
+3.7.4-204.fc18PAE
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-18/buildsys-build-rpmfusion.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- buildsys-build-rpmfusion.spec 17 Jan 2013 08:43:46 -0000 1.48
+++ buildsys-build-rpmfusion.spec 25 Jan 2013 18:46:49 -0000 1.49
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 18
-Release: 4
+Release: 5
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -86,6 +86,9 @@
%changelog
+* Fri Jan 25 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 10:18-5
+- rebuild for kernel 3.7.4-204.fc18
+
* Thu Jan 17 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 10:18-4
- rebuild for kernel 3.7.2-204.fc18
11 years, 10 months
rpms/openafs/F-17 openafs-1.6.1-systemd-fhs.patch, NONE, 1.1 openafs.spec, 1.27, 1.28
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25602
Modified Files:
openafs.spec
Added Files:
openafs-1.6.1-systemd-fhs.patch
Log Message:
* Fri Jan 25 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.2-0.pre3.fc17.1
- add missing patch to CVS
openafs-1.6.1-systemd-fhs.patch:
openafs-client.service | 4 ++--
openafs-server.service | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
--- NEW FILE openafs-1.6.1-systemd-fhs.patch ---
>From 5c440cbf1c57bb22e7ebbeaf164f52e68377252f 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 2d34bb0..6f6a26f 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 $BOSSERVER_ARGS
+ExecStart=/usr/sbin/bosserver $BOSSERVER_ARGS
ExecStop=/usr/bin/bos shutdown localhost -wait -localauth
[Install]
--
1.7.11.7
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/F-17/openafs.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- openafs.spec 25 Jan 2013 09:09:46 -0000 1.27
+++ openafs.spec 25 Jan 2013 09:14:52 -0000 1.28
@@ -15,7 +15,7 @@
Summary: Enterprise Network File System
Name: openafs
Version: 1.6.2
-Release: 0.%{pre}%{?dist}
+Release: 0.%{pre}%{?dist}.1
License: IBM
Group: System Environment/Daemons
URL: http://www.openafs.org
@@ -454,6 +454,9 @@
%{_datadir}/openafs/C/afszcm.cat
%changelog
+* Fri Jan 25 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.2-0.pre3.fc17.1
+- add missing patch to CVS
+
* Tue Jan 22 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.2-0.pre3
- Update to OpenAFS 1.6.2 pre-release 3
11 years, 10 months
rpms/openafs/F-17 afs.conf.systemd, NONE, 1.1 openafs-1.6.1-systemd-env-vars.patch, NONE, 1.1 openafs-1.6.1-systemd-execpoststart.patch, NONE, 1.1 openafs-1.6.1-systemd-kmod-name.patch, NONE, 1.1 openafs-1.6.1-systemd-no-cellservdb.patch, NONE, 1.1 posthooks.sh, NONE, 1.1 setcrypt.sh, NONE, 1.1 sysnames.sh, NONE, 1.1 .cvsignore, 1.8, 1.9 openafs.spec, 1.26, 1.27 sources, 1.11, 1.12 openafs-1.6.1-int31-partsize.patch, 1.1, NONE
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25205
Modified Files:
.cvsignore openafs.spec sources
Added Files:
afs.conf.systemd openafs-1.6.1-systemd-env-vars.patch
openafs-1.6.1-systemd-execpoststart.patch
openafs-1.6.1-systemd-kmod-name.patch
openafs-1.6.1-systemd-no-cellservdb.patch posthooks.sh
setcrypt.sh sysnames.sh
Removed Files:
openafs-1.6.1-int31-partsize.patch
Log Message:
* Tue Jan 22 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.2-0.pre3
- Update to OpenAFS 1.6.2 pre-release 3
--- NEW FILE afs.conf.systemd ---
# Use this file to pass additional options to the afsd and bosserver
# executables.
# Systemd will pass $AFSD_ARGS to afsd.
# You may want to add more settings below.
AFSD_ARGS="-nosettime -afsdb -dynroot -fakestat"
# OpenAFS Client Cache Options
# Default: Memcache - Quick and easy, 100 MB of memory used
CACHE="-memcache -blocks 102400"
# Disk based cache - Use this for servers. Set size in /etc/openafs/cacheinfo
#CACHE="-cachedir /var/cache/openafs"
# Fine-tuned AFS client configuration options. These affect system
# performance.
# Normal workstations, and servers that use AFS sparingly
OPTIONS="-daemons 3"
# For servers, greater AFS performance, and more memory/processes used
# Use these options with the disk based cache settings above.
# OPTIONS="-daemons 5 -chunksize 18 -volumes 512"
# Directory to use for configuration information:
CONFDIR="-confdir /etc/openafs"
# AFS server initialization
#BOSSERVER_ARGS=
openafs-1.6.1-systemd-env-vars.patch:
openafs-client.service | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE openafs-1.6.1-systemd-env-vars.patch ---
>From 1e9b8058d1da1ebde09cd280cf441a4af56e254a 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.7.11.7
openafs-1.6.1-systemd-execpoststart.patch:
openafs-client.service | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE openafs-1.6.1-systemd-execpoststart.patch ---
>From 09090de0313776f114d626bbba8485f08a3e886a Mon Sep 17 00:00:00 2001
From: Jack Neely <jjneely(a)ncsu.edu>
Date: Wed, 7 Nov 2012 17:00:37 -0500
Subject: [PATCH] systemd: Implement hooks for tuning the AFS client
This makes a generic way to modify the behavior of the AFS client
similar to the old style afs_post_init bash function.
---
src/packaging/RedHat/openafs-client.service | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/packaging/RedHat/openafs-client.service b/src/packaging/RedHat/openafs-client.service
index a2348cb..29548ac 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/posthooks.sh
ExecStop=/bin/umount /afs
ExecStop=/usr/sbin/afsd -shutdown
ExecStop=/sbin/rmmod libafs
--
1.7.1
openafs-1.6.1-systemd-kmod-name.patch:
openafs-client.service | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE openafs-1.6.1-systemd-kmod-name.patch ---
>From 1c4448380cae1da4302ec8b74bb74945b692aa70 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.7.11.7
openafs-1.6.1-systemd-no-cellservdb.patch:
openafs-client.service | 3 ---
1 file changed, 3 deletions(-)
--- NEW FILE openafs-1.6.1-systemd-no-cellservdb.patch ---
>From 9ed4e76885f2a315586bf32b3106de86c32c5daa 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.7.11.7
--- NEW FILE posthooks.sh ---
#!/bin/bash
# openafs-posthooks.sh
#
# Copyright 2012 NC State University
# Written by Jack Neely <jjneely(a)ncsu.edu>
#
# SDG
#
# This script runs as a ExecStartPost from the openafs-client.service
# systemd unit. It will source files in /etc/openafs/posthooks.d
# where an admin may place scripts to fine tune the OpenAFS client
# operations, such as turning on encryption. The sysnames.sh script
# in that directory comes with this package.
HOOKS=/etc/openafs/posthooks.d
if [ -d $HOOKS ] ; then
for i in $HOOKS/*.sh ; do
if [ -r "$i" ]; then
. $i
fi
done
unset i
fi
--- NEW FILE setcrypt.sh ---
#!/bin/bash
# By default, turn on encryption of the AFS protocol
/usr/bin/fs setcrypt -crypt on
--- NEW FILE sysnames.sh ---
#!/bin/bash
# /usr/libexec/openafs/sysnames
# Set custom sysnames after starting the afsd service.
# Runs as "ExecStartPost" in openafs-client.service.
# Figure out what we are
_ARCH=`uname -i | sed 's/x86_64/amd64/'`
_KERN=`uname -r | sed 's/\([0-9]\+\)\.\([0-9]\+\)\..*/\1\2/'`
_DIST=""
for d in fedora centos redhat ; do
if [ -f "/etc/$d-release" ] ; then
_DIST=$d
break
fi
done
# What version of the distribution are we? Cut off the Client|Server
# mess from RHEL
_REL=`/bin/rpm -qf --qf '%{version}\n' /etc/${_DIST}-release | sed 's/\([0-9]\+\)[a-zA-Z]\+/\1/'`
# Sysname list. The order here is from specific to general, with a
# fallback to the compiled-in value from /usr/bin/sys. This will be
# used as the sysname search path.
SYSNAMELIST="${_ARCH}_${_DIST}_${_REL} ${_ARCH}_linux${_KERN} $(/usr/bin/sys)"
# Set the sysname
if [ -n "$SYSNAMELIST" ] ; then
_FLAG=0
_CMD=""
for SYSNAME in $SYSNAMELIST ; do
if [ $_FLAG == "1" ] ; then
_CMD="$_CMD -newsys $SYSNAME"
else
_FLAG=1
_CMD="/usr/bin/fs sysname $SYSNAME"
fi
done
fi
$_CMD > /dev/null
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/openafs/F-17/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 4 Apr 2012 19:20:12 -0000 1.8
+++ .cvsignore 25 Jan 2013 09:09:46 -0000 1.9
@@ -1,2 +1,2 @@
-openafs-1.6.1-src.tar.bz2
-openafs-1.6.1-doc.tar.bz2
+openafs-1.6.2pre3-src.tar.bz2
+openafs-1.6.2pre3-doc.tar.bz2
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/F-17/openafs.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- openafs.spec 24 Aug 2012 16:56:50 -0000 1.26
+++ openafs.spec 25 Jan 2013 09:09:46 -0000 1.27
@@ -10,27 +10,50 @@
%define sysname amd64_linux26
%endif
+%define pre pre3
+
Summary: Enterprise Network File System
Name: openafs
-Version: 1.6.1
-Release: 4%{?dist}
+Version: 1.6.2
+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
Source14: afs.conf
+# Similar to afs.conf, but for systemd.
+Source15: afs.conf.systemd
+# Handle AFS post init scriptlets for systemd
+Source16: posthooks.sh
+# Default post init scripts
+Source20: sysnames.sh
+Source21: setcrypt.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: krb5-devel, pam-devel, ncurses-devel, flex, byacc, bison
BuildRequires: automake, autoconf
Patch0: openafs-1.6.0-fPIC.patch
-# Upstream patch to fix fileservers with >2TB partitions
-Patch1: openafs-1.6.1-int31-partsize.patch
+# systemd: Skip CellServDB manipulation
+Patch1: openafs-1.6.1-systemd-no-cellservdb.patch
+# systemd: unload the proper kernel module
+Patch2: openafs-1.6.1-systemd-kmod-name.patch
+# systemd: use FHS-style paths instead of transarc paths
+Patch3: openafs-1.6.1-systemd-fhs.patch
+# systemd: add additional user-friendly environment vars
+Patch4: openafs-1.6.1-systemd-env-vars.patch
+# Add ExecPostStart "sysnames" helper script.
+Patch5: openafs-1.6.1-systemd-execpoststart.patch
+
+# Use systemd unit files on Fedora 18 and above.
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
+ %global _with_systemd 1
+%endif
+
%description
The AFS distributed filesystem. AFS is a distributed filesystem
@@ -45,7 +68,14 @@
%package client
Summary: OpenAFS Filesystem client
Group: System Environment/Daemons
-Requires(post): bash, coreutils, chkconfig, selinux-policy-targeted
+Requires(post): bash, coreutils, selinux-policy-targeted
+%if 0%{?_with_systemd}
+Requires(preun): systemd
+Requires(postun): systemd
+Requires(post): systemd
+%else
+Requires(post): chkconfig
+%endif
Requires: %{name}-kmod >= %{version}
Requires: openafs = %{version}
Provides: %{name}-kmod-common = %{version}
@@ -82,6 +112,11 @@
Summary: OpenAFS Filesystem Server
Group: System Environment/Daemons
Requires: openafs-client = %{version}, openafs = %{version}
+%if 0%{?_with_systemd}
+Requires(preun): systemd
+Requires(postun): systemd
+Requires(post): systemd
+%endif
%description server
The AFS distributed filesystem. AFS is a distributed filesystem
@@ -93,14 +128,17 @@
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
-# # This allows fileservers to report correct partition usage on
-# partitions greater than 2TB.
-%patch1 -p1
+# systemd unit file changes for RPM Fusion
+%patch1 -p1 -b .cellservdb
+%patch2 -p1 -b .kmod
+%patch3 -p1 -b .fhs
+%patch4 -p1 -b .envvars
+%patch5 -p1 -b .execpoststart
# Convert the licese to UTF-8
mv src/LICENSE src/LICENSE~
@@ -149,13 +187,38 @@
install -p -m 644 %{SOURCE12} ${RPM_BUILD_ROOT}%{_sysconfdir}/openafs
echo %{thiscell} > ${RPM_BUILD_ROOT}%{_sysconfdir}/openafs/ThisCell
-# install the init script
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d
-install -m 755 %{SOURCE13} ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/openafs
+# install the init file(s)
+%if 0%{?_with_systemd}
+ # install systemd service files
+ mkdir -p ${RPM_BUILD_ROOT}%{_unitdir}
+ pushd src/packaging/RedHat
+ install -p -m 644 openafs-client.service \
+ ${RPM_BUILD_ROOT}%{_unitdir}/openafs-client.service
+ install -p -m 644 openafs-server.service \
+ ${RPM_BUILD_ROOT}%{_unitdir}/openafs-server.service
+ popd
+ # install "sysnames" helper script
+ install -p -m 755 %{SOURCE16} \
+ ${RPM_BUILD_ROOT}%{_libexecdir}/openafs/posthooks.sh
+ install -d -m 755 \
+ ${RPM_BUILD_ROOT}%{_sysconfdir}/openafs/posthooks.d
+ install -p -m 644 %{SOURCE20} \
+ ${RPM_BUILD_ROOT}%{_sysconfdir}/openafs/posthooks.d/sysnames.sh
+ install -p -m 644 %{SOURCE21} \
+ ${RPM_BUILD_ROOT}%{_sysconfdir}/openafs/posthooks.d/setcrypt.sh
+%else
+ # install legacy SysV init script
+ mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d
+ install -m 755 %{SOURCE13} ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/openafs
+%endif
# sysconfig file
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
-install -m 644 %{SOURCE14} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/openafs
+%if 0%{?_with_systemd}
+ install -m 644 %{SOURCE15} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/openafs
+%else
+ install -m 644 %{SOURCE14} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/openafs
+%endif
# Include the vlclient binary
install -m 755 src/vlserver/vlclient ${RPM_BUILD_ROOT}/usr/sbin/vlclient
@@ -203,11 +266,18 @@
# don't restart in post because kernel modules could well have changed
%post
/sbin/ldconfig
-if [ $1 = 1 ]; then
+%if 0%{?_with_systemd}
+ # systemd unit files are in the -client and -server subpackages.
+%else
+ if [ $1 = 1 ]; then
/sbin/chkconfig --add openafs
-fi
+ fi
+%endif
%post client
+%if !0%{?_with_systemd}
+ %systemd_post openafs-client.service
+%endif
# if this is owned by the package, upgrades with afs running can't work
if [ ! -d /afs ] ; then
mkdir -m 700 /afs
@@ -215,15 +285,44 @@
fi
exit 0
+%post server
+%if !0%{?_with_systemd}
+ %systemd_post openafs-server.service
+%endif
+
%preun
-if [ "$1" = 0 ] ; then
+%if 0%{?_with_systemd}
+ # systemd unit files are in the -client and -server subpackages.
+%else
+ if [ "$1" = 0 ] ; then
/sbin/chkconfig --del openafs
%{_sysconfdir}/rc.d/init.d/openafs stop && rmdir /afs
-fi
-exit 0
+ fi
+ exit 0
+%endif
+
+%preun client
+%if 0%{?_with_systemd}
+ %systemd_preun openafs-client.service
+%endif
+
+%preun server
+%if 0%{?_with_systemd}
+ %systemd_preun openafs-server.service
+%endif
%postun -p /sbin/ldconfig
+%postun client
+%if 0%{?_with_systemd}
+ %systemd_postun openafs-client.service
+%endif
+
+%postun server
+%if 0%{?_with_systemd}
+ %systemd_postun openafs-server.service
+%endif
+
%post devel -p /sbin/ldconfig
%postun devel -p /sbin/ldconfig
@@ -233,10 +332,16 @@
%files
%defattr(-, root, root, -)
+%dir %{_sysconfdir}/openafs
+%dir %{_libexecdir}/openafs
%doc src/LICENSE README NEWS README.DEVEL README.GIT README.PTHREADED_UBIK
%doc README.WARNINGS README-WINDOWS
%config(noreplace) %{_sysconfdir}/sysconfig/*
+%if 0%{?_with_systemd}
+# systemd files are in -client and -server subpackages
+%else
%{_sysconfdir}/rc.d/init.d/*
+%endif
%{_bindir}/aklog
%{_bindir}/bos
%{_bindir}/fs
@@ -274,11 +379,15 @@
%files client
%defattr(-, root, root)
-%dir %{_sysconfdir}/openafs
%dir %{_localstatedir}/cache/openafs
%config(noreplace) %{_sysconfdir}/openafs/CellServDB
%config(noreplace) %{_sysconfdir}/openafs/ThisCell
%config(noreplace) %{_sysconfdir}/openafs/cacheinfo
+%if 0%{?_with_systemd}
+%{_unitdir}/openafs-client.service
+%{_libexecdir}/openafs/posthooks.sh
+%{_sysconfdir}/openafs/posthooks.d/*.sh
+%endif
%{_bindir}/afsio
%{_bindir}/cmdebug
%{_bindir}/xstat_cm_test
@@ -286,12 +395,27 @@
%files server
%defattr(-,root,root)
+%if 0%{?_with_systemd}
+%{_unitdir}/openafs-server.service
+%endif
%{_bindir}/afsmonitor
%{_bindir}/asetkey
%{_bindir}/scout
%{_bindir}/udebug
%{_bindir}/xstat_fs_test
-%{_libexecdir}/openafs
+%{_libexecdir}/openafs/buserver
+%{_libexecdir}/openafs/dafileserver
+%{_libexecdir}/openafs/dasalvager
+%{_libexecdir}/openafs/davolserver
+%{_libexecdir}/openafs/fileserver
+%{_libexecdir}/openafs/kaserver
+%{_libexecdir}/openafs/ptserver
+%{_libexecdir}/openafs/salvager
+%{_libexecdir}/openafs/salvageserver
+%{_libexecdir}/openafs/upclient
+%{_libexecdir}/openafs/upserver
+%{_libexecdir}/openafs/vlserver
+%{_libexecdir}/openafs/volserver
%{_sbindir}/dafssync-debug
%{_sbindir}/fssync-debug
%{_sbindir}/salvsync-debug
@@ -330,12 +454,40 @@
%{_datadir}/openafs/C/afszcm.cat
%changelog
-* Thu Aug 23 2012 Jack Neely <jjneely(a)ncsu.edu> 0:1.6.1-4
+* Tue Jan 22 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.2-0.pre3
+- Update to OpenAFS 1.6.2 pre-release 3
+
+* Wed Dec 26 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.2-0.pre2
+- Update to OpenAFS 1.6.2 pre-release 2
+
+* Thu Dec 13 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.2-0.pre1
+- Update to OpenAFS 1.6.2 pre-release 1
+- Remove upstreamed patches
+
+* Tue Dec 11 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-9
+- Correct bosserver path in systemd unit file
+
+* Wed Nov 08 2012 Jack Neely <jjneely(a)ncsu.edu> 0:1.6.1-8
+- Implement a directory for sourced post init scripts. These
+ fine tune the AFS client's behavior after startup and live in
+ /etc/openafs/posthooks.d/
+
+* Wed Nov 07 2012 Jack Neely <jjneely(a)ncsu.edu> 0:1.6.1-7
+- Fine tune the systemd version of /etc/sysconfig/openafs
+ to use -fakestat and have some options settable by the user.
+
+* Mon Oct 8 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-6
+- Enable systemd unit files for F18 and above
+
+* Thu Aug 23 2012 Jack Neely <jjneely(a)ncsu.edu> 0:1.6.1-5
- Update /etc/sysconfig/openafs to have some more current
default settings.
- AFS_CACHE_DIR is now pre-poplated with the default value
- Encryption is used by default
+* Wed Aug 22 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-4
+- Upstream patch for new glibc
+
* Wed Aug 22 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-3
- Patch to allow fileservers to report correct partition
usage data on partitions sizes greater than 2TB.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs/F-17/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 4 Apr 2012 19:20:12 -0000 1.11
+++ sources 25 Jan 2013 09:09:46 -0000 1.12
@@ -1,2 +1,2 @@
-7215609990a2b253f8980fc1e1da0530 openafs-1.6.1-src.tar.bz2
-73d9a86038e827f95de90cf56c940bf7 openafs-1.6.1-doc.tar.bz2
+d4130bb529c26c2f0d232410f96004a4 openafs-1.6.2pre3-src.tar.bz2
+03ad50744114a8c2839851570a6faf44 openafs-1.6.2pre3-doc.tar.bz2
--- openafs-1.6.1-int31-partsize.patch DELETED ---
11 years, 10 months
rpms/openafs-kmod/F-17 .cvsignore, 1.9, 1.10 openafs-kmod.spec, 1.65, 1.66 sources, 1.11, 1.12 openafs-1.6.1-0001-Linux-bypass-consolidate-copy_page-macros-into-a-sin.patch, 1.1, NONE openafs-1.6.1-0002-Linux-3.6-kmap_atomic-API-change.patch, 1.1, NONE openafs-1.6.1-0003-Linux-3.6-dentry_open-API-change.patch, 1.1, NONE openafs-1.6.1-0004-Linux-3.6-d_alias-and-i_dentry-are-now-hlists.patch, 1.1, NONE openafs-1.6.1-0005-Linux-fix-variable-used-to-test-for-the-iop-create-A.patch, 1.1, NONE openafs-1.6.1-000
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25171
Modified Files:
.cvsignore openafs-kmod.spec sources
Removed Files:
openafs-1.6.1-0001-Linux-bypass-consolidate-copy_page-macros-into-a-sin.patch
openafs-1.6.1-0002-Linux-3.6-kmap_atomic-API-change.patch
openafs-1.6.1-0003-Linux-3.6-dentry_open-API-change.patch
openafs-1.6.1-0004-Linux-3.6-d_alias-and-i_dentry-are-now-hlists.patch
openafs-1.6.1-0005-Linux-fix-variable-used-to-test-for-the-iop-create-A.patch
openafs-1.6.1-0006-Linux-3.6-create-inode-operation-API-change.patch
openafs-1.6.1-0007-Linux-3.6-revalidate-dentry-op-API-change.patch
openafs-1.6.1-0008-Linux-3.6-lookup-inode-operation-API-change.patch
openafs-1.6.1-clear_inode.patch openafs-1.6.1-encode_fh.patch
Log Message:
* Tue Jan 22 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.2-0.pre3
- Update to OpenAFS 1.6.2 pre-release 3
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-17/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 4 Apr 2012 19:18:10 -0000 1.9
+++ .cvsignore 25 Jan 2013 09:09:41 -0000 1.10
@@ -1 +1 @@
-openafs-1.6.1-src.tar.bz2
+openafs-1.6.2pre3-src.tar.bz2
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-17/openafs-kmod.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- openafs-kmod.spec 19 Jan 2013 23:44:02 -0000 1.65
+++ openafs-kmod.spec 25 Jan 2013 09:09:41 -0000 1.66
@@ -17,59 +17,22 @@
%define kmod_name openafs
+%define pre pre3
+
# name should have a -kmod suffix
Name: %{kmod_name}-kmod
-Version: 1.6.1
-Release: 4%{?dist}.15
+Version: 1.6.2
+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)
-# Upstream patches to build on kernel 3.5
-Patch0: openafs-1.6.1-clear_inode.patch
-Patch1: openafs-1.6.1-encode_fh.patch
-
-# Upstream patches to build on kernel 3.6. In-progress in Gerrit.
-# Steps to create these patches:
-# 1) git clone from openafs.org
-# 2) git checkout openafs-stable-1_6_1
-# 3) git checkout -b fedora
-# 4) Get the two Patches above (patch0 and patch1)
-# git cherry-pick -x cc63cbbc138f60d6b5964fa859dcd778717b24c2
-# git cherry-pick -x 407e7c90a97143d436ad3a6af6bbfa431c849191
-# 5) Take note of the commit hash here.
-# 6) Cherry-pick the appropriate patches from Gerrit onto this "fedora" branch
-# When cherry-picking "d_alias and i_dentry are now hlists"
-# (http://gerrit.openafs.org/8080), avoid the post-1.6.1 canonical_dentry()
-# function from http://gerrit.openafs.org/7951 .
-# 7) Create the patch files
-# git format-patch <hash in step 5>
-# If you forgot the hash from step 5, look with "git log --oneline"
-# 8) Rename patche files according to Fedora package guidelines:
-# for i in $(ls *.patch); do mv $i openafs-1.6.1-$i; done
-
-# http://gerrit.openafs.org/8077
-Patch4: openafs-1.6.1-0001-Linux-bypass-consolidate-copy_page-macros-into-a-sin.patch
-# http://gerrit.openafs.org/8078
-Patch5: openafs-1.6.1-0002-Linux-3.6-kmap_atomic-API-change.patch
-# http://gerrit.openafs.org/8079
-Patch6: openafs-1.6.1-0003-Linux-3.6-dentry_open-API-change.patch
-# http://gerrit.openafs.org/8080
-Patch7: openafs-1.6.1-0004-Linux-3.6-d_alias-and-i_dentry-are-now-hlists.patch
-# http://gerrit.openafs.org/8081
-Patch8: openafs-1.6.1-0005-Linux-fix-variable-used-to-test-for-the-iop-create-A.patch
-# http://gerrit.openafs.org/8082
-Patch9: openafs-1.6.1-0006-Linux-3.6-create-inode-operation-API-change.patch
-# http://gerrit.openafs.org/8083
-Patch10: openafs-1.6.1-0007-Linux-3.6-revalidate-dentry-op-API-change.patch
-# http://gerrit.openafs.org/8084
-Patch11: openafs-1.6.1-0008-Linux-3.6-lookup-inode-operation-API-change.patch
%global AkmodsBuildRequires %{_bindir}/kmodtool, pam-devel, ncurses-devel, flex, byacc, bison, automake
BuildRequires: %{AkmodsBuildRequires}
@@ -96,24 +59,12 @@
%setup -q -c -T -a 0
# apply patches and do other stuff here
-pushd %{kmod_name}-%{version}
-# Kernel 3.5 patches
-%patch0 -p1
-%patch1 -p1
-# Kernel 3.6 patches
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
+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
@@ -147,50 +98,27 @@
%changelog
-* Sat Jan 19 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-4.15
-- Rebuilt for updated kernel
-
-* Thu Jan 17 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-4.14
-- Rebuilt for updated kernel
+* Tue Jan 22 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.2-0.pre3
+- Update to OpenAFS 1.6.2 pre-release 3
-* Wed Jan 09 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-4.13
+* Thu Jan 17 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.2-0.pre2.4
- Rebuilt for updated kernel
-* Sun Dec 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-4.12
+* Mon Jan 14 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.2-0.pre2.3
- Rebuilt for updated kernel
-* Sat Dec 22 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-4.11
+* Sun Jan 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.2-0.pre2.2
- Rebuilt for updated kernel
-* Tue Dec 18 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-4.10
-- Rebuilt for updated kernel
+* Thu Jan 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.2-0.pre2.1
+- Rebuilt for f18 final kernel
-* Wed Dec 12 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-4.9
-- Rebuilt for updated kernel
+* Wed Dec 26 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.2-0.pre2
+- Update to OpenAFS 1.6.2 pre-release 2
-* Wed Dec 05 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-4.8
-- Rebuilt for updated kernel
-
-* Wed Nov 28 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-4.7
-- Rebuilt for updated kernel
-
-* Wed Nov 21 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-4.6
-- Rebuilt for updated kernel
-
-* Tue Nov 20 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-4.5
-- Rebuilt for updated kernel
-
-* Thu Nov 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-4.4
-- Rebuilt for updated kernel
-
-* Thu Nov 01 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-4.3
-- Rebuilt for updated kernel
-
-* Tue Oct 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-4.2
-- Rebuilt for updated kernel
-
-* Thu Oct 18 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-4.1
-- Rebuilt for updated kernel
+* Tue Dec 11 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.2-0.pre1
+- Update to OpenAFS 1.6.2 pre-release 1
+- Remove upstreamed patches
* Sat Oct 06 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.1-4
- Rebuild for F-18 Beta. Debugging is now disabled in F-18 kernels.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-17/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 4 Apr 2012 19:18:10 -0000 1.11
+++ sources 25 Jan 2013 09:09:41 -0000 1.12
@@ -1 +1 @@
-7215609990a2b253f8980fc1e1da0530 openafs-1.6.1-src.tar.bz2
+d4130bb529c26c2f0d232410f96004a4 openafs-1.6.2pre3-src.tar.bz2
--- openafs-1.6.1-0001-Linux-bypass-consolidate-copy_page-macros-into-a-sin.patch DELETED ---
--- openafs-1.6.1-0002-Linux-3.6-kmap_atomic-API-change.patch DELETED ---
--- openafs-1.6.1-0003-Linux-3.6-dentry_open-API-change.patch DELETED ---
--- openafs-1.6.1-0004-Linux-3.6-d_alias-and-i_dentry-are-now-hlists.patch DELETED ---
--- openafs-1.6.1-0005-Linux-fix-variable-used-to-test-for-the-iop-create-A.patch DELETED ---
--- openafs-1.6.1-0006-Linux-3.6-create-inode-operation-API-change.patch DELETED ---
--- openafs-1.6.1-0007-Linux-3.6-revalidate-dentry-op-API-change.patch DELETED ---
--- openafs-1.6.1-0008-Linux-3.6-lookup-inode-operation-API-change.patch DELETED ---
--- openafs-1.6.1-clear_inode.patch DELETED ---
--- openafs-1.6.1-encode_fh.patch DELETED ---
11 years, 10 months
rpms/freetype-freeworld/F-17 freetype-2.4.8-CVE-2012-5669.patch, NONE, 1.1 freetype-freeworld.spec, 1.24, 1.25
by Kevin Kofler
Author: kkofler
Update of /cvs/free/rpms/freetype-freeworld/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6172/F-17
Modified Files:
freetype-freeworld.spec
Added Files:
freetype-2.4.8-CVE-2012-5669.patch
Log Message:
* Fri Jan 25 2013 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.4.8-4
- Add freetype-2.4.8-CVE-2012-5669.patch from Fedora freetype (rh#903554)
freetype-2.4.8-CVE-2012-5669.patch:
bdflib.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
--- NEW FILE freetype-2.4.8-CVE-2012-5669.patch ---
--- freetype-2.4.8/src/bdf/bdflib.c 2013-01-24 15:30:15.000000000 +0100
+++ freetype-2.4.8/src/bdf/bdflib.c 2013-01-24 15:30:32.269960403 +0100
@@ -1600,10 +1600,11 @@
if ( p->glyph_enc < -1 )
p->glyph_enc = -1;
- /* Check that the encoding is in the range [0,65536] because */
- /* otherwise p->have (a bitmap with static size) overflows. */
- if ( p->glyph_enc > 0 &&
- (size_t)p->glyph_enc >= sizeof ( p->have ) * 8 )
+ /* Check that the encoding is in the Unicode range because */
+ /* otherwise p->have (a bitmap with static size) overflows. */
+ if ( p->glyph_enc > 0 &&
+ (size_t)p->glyph_enc >= sizeof ( p->have ) /
+ sizeof ( unsigned long ) * 32 )
{
error = BDF_Err_Invalid_File_Format;
goto Exit;
Index: freetype-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/freetype-freeworld/F-17/freetype-freeworld.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- freetype-freeworld.spec 2 Apr 2012 00:32:55 -0000 1.24
+++ freetype-freeworld.spec 25 Jan 2013 00:26:49 -0000 1.25
@@ -1,7 +1,7 @@
Summary: A free and portable font rendering engine
Name: freetype-freeworld
Version: 2.4.8
-Release: 3%{?dist}
+Release: 4%{?dist}
License: FTL or GPLv2+
Group: System Environment/Libraries
URL: http://www.freetype.org
@@ -32,6 +32,8 @@
Patch105: freetype-2.4.8-CVE-2012-1143.patch
Patch106: freetype-2.4.8-CVE-2012-1144.patch
Patch107: freetype-2.4.8-bdf-overflow.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=903554
+Patch108: freetype-2.4.8-CVE-2012-5669.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
@@ -79,6 +81,7 @@
%patch105 -p1 -b .CVE-2012-1143
%patch106 -p1 -b .CVE-2012-1144
%patch107 -p1 -b .bdf-overflow
+%patch108 -p1 -b .CVE-2012-5669
%build
@@ -123,6 +126,9 @@
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%changelog
+* Fri Jan 25 2013 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.4.8-4
+- Add freetype-2.4.8-CVE-2012-5669.patch from Fedora freetype (rh#903554)
+
* Mon Apr 02 2012 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.4.8-3
- Add security patches from Fedora freetype-2.4.8-3 (rh#806270)
11 years, 10 months
rpms/freetype-freeworld/F-18 freetype-2.4.10-CVE-2012-5669.patch, NONE, 1.1 freetype-freeworld.spec, 1.25, 1.26
by Kevin Kofler
Author: kkofler
Update of /cvs/free/rpms/freetype-freeworld/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5782/F-18
Modified Files:
freetype-freeworld.spec
Added Files:
freetype-2.4.10-CVE-2012-5669.patch
Log Message:
* Fri Jan 25 2013 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.4.10-2
- Add freetype-2.4.10-CVE-2012-5669.patch from Fedora freetype (rh#903554)
freetype-2.4.10-CVE-2012-5669.patch:
bdflib.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- NEW FILE freetype-2.4.10-CVE-2012-5669.patch ---
--- a/src/bdf/bdflib.c
+++ b/src/bdf/bdflib.c
@@ -1628,8 +1628,9 @@
/* Check that the encoding is in the Unicode range because */
/* otherwise p->have (a bitmap with static size) overflows. */
- if ( p->glyph_enc > 0 &&
- (size_t)p->glyph_enc >= sizeof ( p->have ) * 8 )
+ if ( p->glyph_enc > 0 &&
+ (size_t)p->glyph_enc >= sizeof ( p->have ) /
+ sizeof ( unsigned long ) * 32 )
{
FT_ERROR(( "_bdf_parse_glyphs: " ERRMSG5, lineno, "ENCODING" ));
error = BDF_Err_Invalid_File_Format;
Index: freetype-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/freetype-freeworld/F-18/freetype-freeworld.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- freetype-freeworld.spec 16 Jul 2012 20:16:57 -0000 1.25
+++ freetype-freeworld.spec 25 Jan 2013 00:22:44 -0000 1.26
@@ -1,7 +1,7 @@
Summary: A free and portable font rendering engine
Name: freetype-freeworld
Version: 2.4.10
-Release: 1%{?dist}
+Release: 2%{?dist}
License: FTL or GPLv2+
Group: System Environment/Libraries
URL: http://www.freetype.org
@@ -12,6 +12,10 @@
# Enable otvalid and gxvalid modules
Patch46: freetype-2.2.1-enable-valid.patch
+# Security patches
+# https://bugzilla.redhat.com/show_bug.cgi?id=903554
+Patch89: freetype-2.4.10-CVE-2012-5669.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
Provides: freetype-bytecode
@@ -39,6 +43,8 @@
%patch46 -p1 -b .enable-valid
+%patch89 -p1 -b .CVE-2012-5669
+
%build
@@ -83,6 +89,9 @@
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%changelog
+* Fri Jan 25 2013 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.4.10-2
+- Add freetype-2.4.10-CVE-2012-5669.patch from Fedora freetype (rh#903554)
+
* Mon Jul 16 2012 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.4.10-1
- Update to 2.4.10 (matches Fedora freetype, rh#832651)
- Drop upstreamed patches (CVE-2012-1139, CVE-2012-1141, backported bugfixes)
11 years, 10 months
rpms/picard-freeworld/F-17 .cvsignore, 1.7, 1.8 picard-freeworld.spec, 1.17, 1.18 sources, 1.9, 1.10
by Alex Lancaster
Author: alexlan
Update of /cvs/free/rpms/picard-freeworld/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27319
Modified Files:
.cvsignore picard-freeworld.spec sources
Log Message:
Update to latest upstream 1.1
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/picard-freeworld/F-17/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 4 Jun 2012 18:59:48 -0000 1.7
+++ .cvsignore 23 Jan 2013 23:15:07 -0000 1.8
@@ -1 +1 @@
-picard-1.0.tar.gz
+picard-1.1.tar.gz
Index: picard-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/picard-freeworld/F-17/picard-freeworld.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- picard-freeworld.spec 4 Jun 2012 18:59:48 -0000 1.17
+++ picard-freeworld.spec 23 Jan 2013 23:15:07 -0000 1.18
@@ -2,7 +2,7 @@
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Name: picard-freeworld
-Version: 1.0
+Version: 1.1
Release: 1%{?dist}
Summary: MusicBrainz-based audio tagger
Group: Applications/Multimedia
@@ -56,6 +56,15 @@
%{python_sitearch}/picard/musicdns/avcodec.so
%changelog
+* Wed Jan 23 2013 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.1-1
+- Update to upstream 1.1
+
+* Sat Nov 24 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0-3
+- Rebuilt for FFmpeg 1.0
+
+* Tue Jun 26 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0-2
+- Rebuilt for FFmpeg
+
* Mon Jun 4 2012 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.0-1
- Sync with new 1.0 in Fedora
Index: sources
===================================================================
RCS file: /cvs/free/rpms/picard-freeworld/F-17/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 4 Jun 2012 18:59:48 -0000 1.9
+++ sources 23 Jan 2013 23:15:07 -0000 1.10
@@ -1 +1 @@
-2ac5d31763caaf1e6d374049ca4c134e picard-1.0.tar.gz
+57abb76632a423760f336ac11da5c149 picard-1.1.tar.gz
11 years, 10 months
rpms/picard-freeworld/F-18 .cvsignore, 1.7, 1.8 picard-freeworld.spec, 1.19, 1.20 sources, 1.9, 1.10
by Alex Lancaster
Author: alexlan
Update of /cvs/free/rpms/picard-freeworld/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27109
Modified Files:
.cvsignore picard-freeworld.spec sources
Log Message:
Update to upstream 1.1
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/picard-freeworld/F-18/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 4 Jun 2012 18:50:02 -0000 1.7
+++ .cvsignore 23 Jan 2013 22:56:42 -0000 1.8
@@ -1 +1 @@
-picard-1.0.tar.gz
+picard-1.1.tar.gz
Index: picard-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/picard-freeworld/F-18/picard-freeworld.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- picard-freeworld.spec 24 Nov 2012 15:23:50 -0000 1.19
+++ picard-freeworld.spec 23 Jan 2013 22:56:42 -0000 1.20
@@ -2,8 +2,8 @@
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Name: picard-freeworld
-Version: 1.0
-Release: 3%{?dist}
+Version: 1.1
+Release: 1%{?dist}
Summary: MusicBrainz-based audio tagger
Group: Applications/Multimedia
@@ -56,6 +56,9 @@
%{python_sitearch}/picard/musicdns/avcodec.so
%changelog
+* Wed Jan 23 2013 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.1-1
+- Update to upstream 1.1
+
* Sat Nov 24 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0-3
- Rebuilt for FFmpeg 1.0
Index: sources
===================================================================
RCS file: /cvs/free/rpms/picard-freeworld/F-18/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 4 Jun 2012 18:50:02 -0000 1.9
+++ sources 23 Jan 2013 22:56:42 -0000 1.10
@@ -1 +1 @@
-2ac5d31763caaf1e6d374049ca4c134e picard-1.0.tar.gz
+57abb76632a423760f336ac11da5c149 picard-1.1.tar.gz
11 years, 10 months
rpms/picard-freeworld/devel picard-freeworld.spec,1.20,1.21
by Alex Lancaster
Author: alexlan
Update of /cvs/free/rpms/picard-freeworld/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26440
Modified Files:
picard-freeworld.spec
Log Message:
Problem with name of package.
Index: picard-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/picard-freeworld/devel/picard-freeworld.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- picard-freeworld.spec 23 Jan 2013 05:46:39 -0000 1.20
+++ picard-freeworld.spec 23 Jan 2013 22:45:05 -0000 1.21
@@ -1,7 +1,7 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-Name: picard
+Name: picard-freeworld
Version: 1.1
Release: 1%{?dist}
Summary: MusicBrainz-based audio tagger
11 years, 10 months
rpms/openafs/F-18 .cvsignore, 1.9, 1.10 openafs.spec, 1.32, 1.33 sources, 1.13, 1.14
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25123
Modified Files:
.cvsignore openafs.spec sources
Log Message:
* Tue Jan 22 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.2-0.pre3
- Update to OpenAFS 1.6.2 pre-release 3
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/openafs/F-18/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 27 Dec 2012 02:28:57 -0000 1.9
+++ .cvsignore 23 Jan 2013 20:05:48 -0000 1.10
@@ -1,2 +1,2 @@
-openafs-1.6.2pre2-src.tar.bz2
-openafs-1.6.2pre2-doc.tar.bz2
+openafs-1.6.2pre3-src.tar.bz2
+openafs-1.6.2pre3-doc.tar.bz2
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/F-18/openafs.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- openafs.spec 27 Dec 2012 02:28:57 -0000 1.32
+++ openafs.spec 23 Jan 2013 20:05:49 -0000 1.33
@@ -10,7 +10,7 @@
%define sysname amd64_linux26
%endif
-%define pre pre2
+%define pre pre3
Summary: Enterprise Network File System
Name: openafs
@@ -454,6 +454,9 @@
%{_datadir}/openafs/C/afszcm.cat
%changelog
+* Tue Jan 22 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.2-0.pre3
+- Update to OpenAFS 1.6.2 pre-release 3
+
* Wed Dec 26 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.2-0.pre2
- Update to OpenAFS 1.6.2 pre-release 2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs/F-18/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 27 Dec 2012 02:28:57 -0000 1.13
+++ sources 23 Jan 2013 20:05:50 -0000 1.14
@@ -1,2 +1,2 @@
-5fdf6f2725788d9526770d560c8541aa openafs-1.6.2pre2-src.tar.bz2
-cd11865790af683bc785dc580661bf2f openafs-1.6.2pre2-doc.tar.bz2
+d4130bb529c26c2f0d232410f96004a4 openafs-1.6.2pre3-src.tar.bz2
+03ad50744114a8c2839851570a6faf44 openafs-1.6.2pre3-doc.tar.bz2
11 years, 10 months