rpms/minitube/F-17 minitube-1.8-1-disable-update-check.patch, NONE, 1.1 minitube.spec, 1.16, 1.17 sources, 1.11, 1.12
by Magnus Tuominen
Author: magnu5
Update of /cvs/free/rpms/minitube/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20556
Modified Files:
minitube.spec sources
Added Files:
minitube-1.8-1-disable-update-check.patch
Log Message:
* Fri Aug 24 2012 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.8.0-1
- 1.8.0
- clean spec file
- disable-update-patch borrowed from debian
minitube-1.8-1-disable-update-check.patch:
MainWindow.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE minitube-1.8-1-disable-update-check.patch ---
diff -up src/MainWindow.cpp.orig src/MainWindow.cpp
--- src/MainWindow.cpp.orig 2012-08-24 09:32:11.454026355 +0300
+++ src/MainWindow.cpp 2012-08-24 09:32:24.429901026 +0300
@@ -124,7 +124,7 @@ MainWindow::MainWindow() :
setAcceptDrops(true);
- QTimer::singleShot(0, this, SLOT(checkForUpdate()));
+ //QTimer::singleShot(0, this, SLOT(checkForUpdate()));
}
Index: minitube.spec
===================================================================
RCS file: /cvs/free/rpms/minitube/F-17/minitube.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- minitube.spec 2 Mar 2012 14:54:19 -0000 1.16
+++ minitube.spec 24 Aug 2012 06:52:53 -0000 1.17
@@ -1,6 +1,6 @@
Name: minitube
-Version: 1.7
-Release: 2%{?dist}
+Version: 1.8.0
+Release: 1%{?dist}
Summary: A YouTube desktop client
Group: Applications/Multimedia
@@ -34,10 +34,7 @@
Source0: http://flavio.tordini.org/files/%{name}/%{name}.tar.gz
# fixes requirement on bundled qtsingleapplication
Patch0: minitube-qtsingleapp.patch
-Patch1: minitube-1.7-translation.patch
-Patch2: minitube-1.7-updateCheckRemoval.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
+Patch1: minitube-1.8-1-disable-update-check.patch
BuildRequires: qt4-devel
BuildRequires: desktop-file-utils
@@ -45,15 +42,9 @@
BuildRequires: qtsingleapplication-devel
BuildRequires: gettext
Requires: hicolor-icon-theme
-
-# KDE 4.6.1 in fedora 15 defaults to phonon-backend-gstreamer
-# add gstreamer-ffmpeg as Required.
-%if 0%{?fedora} && 0%{?fedora} > 14
Requires: gstreamer-ffmpeg
-%else
-Requires: xine-lib-extras-freeworld
-%endif
+%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
%description
Minitube is a YouTube desktop client.
With it you can watch YouTube videos in a new way:
@@ -64,27 +55,11 @@
%prep
%setup -q -n %{name}
-# Fix spurious-executable-perm
-chmod -x src/*{h,cpp}
-
# remove bundled copy of qtsingleapplication
rm -rf src/qtsingleapplication
-# rename badly named translation files
-mv locale/sv_SE.ts locale/sv.ts
-mv locale/en_US.ts locale/en.ts
-mv locale/de_DE.ts locale/de.ts
-mv locale/fi_FI.ts locale/fi.ts
-mv locale/he_IL.ts locale/he.ts
-mv locale/ka_GE.ts locale/ka.ts
-mv locale/uk_UA.ts locale/uk.ts
-mv locale/zh_CN.ts locale/zh-temp.ts
-# we want that one^..
-# removing the rest
-rm -rf locale/*_*.ts
-mv locale/zh-temp.ts locale/zh_CN.ts
+
%patch0 -p 1
%patch1 -p 0
-%patch2 -p 0
%build
@@ -100,17 +75,15 @@
--delete-original \
%{buildroot}%{_datadir}/applications/%{name}.desktop
-# There is a bug in find-lang.sh (see BZ #729336)
-# heavily borrowed from /usr/lib/rpm/find-lang.sh
-find %{buildroot} -type f -o -type l|sort|sed '
-s:'"%{buildroot}"'::
-s:\(.*/locale/\)\([^/_]\+\)\(.*\.qm$\):%lang(\2) \1\2\3:
-s:^\([^%].*\)::
+# %%find_lang
+# There is a bug in find-lang.sh (see BZ #729336)
+# heavily borrowed from /usr/lib/rpm/find-lang.sh
+find %{buildroot} -type f -o -type l|sort|sed '
+s:'"%{buildroot}"'::
+s:\(.*/locale/\)\([^/_]\+\)\(.*\.qm$\):%lang(\2) \1\2\3:
+s:^\([^%].*\)::
/^$/d' > %{name}.lang
-%clean
-rm -rf %{buildroot}
-
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -124,14 +97,26 @@
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING LICENSE.LGPL CHANGES TODO INSTALL
+%doc AUTHORS COPYING LICENSE.LGPL CHANGES TODO
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+%dir %{_datadir}/%{name}/
+%dir %{_datadir}/%{name}/locale
%changelog
+* Fri Aug 24 2012 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.8.0-1
+- 1.8.0
+- clean spec file
+- disable-update-patch borrowed from debian
+
+* Fri Apr 12 2012 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.7.1-1
+- 1.7.1
+- removed INSTALL
+- own dir
+- removed legacy stuff from spec
+
* Fri Mar 02 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.7-2
- Rebuilt for c++ ABI breakage
Index: sources
===================================================================
RCS file: /cvs/free/rpms/minitube/F-17/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 6 Jan 2012 19:38:30 -0000 1.11
+++ sources 24 Aug 2012 06:52:53 -0000 1.12
@@ -1 +1 @@
-9a657616eaa32311296d41eb99717ec2 minitube.tar.gz
+dabfe4776ab6a19eff14e644f68714bb minitube.tar.gz
11 years, 9 months
rpms/minitube/F-18 minitube-1.8-1-disable-update-check.patch, NONE, 1.1 minitube.spec, 1.16, 1.17 sources, 1.11, 1.12
by Magnus Tuominen
Author: magnu5
Update of /cvs/free/rpms/minitube/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20260
Modified Files:
minitube.spec sources
Added Files:
minitube-1.8-1-disable-update-check.patch
Log Message:
* Fri Aug 24 2012 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.8.0-1
- 1.8.0
- clean spec file
- disable-update-patch borrowed from debian
minitube-1.8-1-disable-update-check.patch:
MainWindow.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE minitube-1.8-1-disable-update-check.patch ---
diff -up src/MainWindow.cpp.orig src/MainWindow.cpp
--- src/MainWindow.cpp.orig 2012-08-24 09:32:11.454026355 +0300
+++ src/MainWindow.cpp 2012-08-24 09:32:24.429901026 +0300
@@ -124,7 +124,7 @@ MainWindow::MainWindow() :
setAcceptDrops(true);
- QTimer::singleShot(0, this, SLOT(checkForUpdate()));
+ //QTimer::singleShot(0, this, SLOT(checkForUpdate()));
}
Index: minitube.spec
===================================================================
RCS file: /cvs/free/rpms/minitube/F-18/minitube.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- minitube.spec 2 Mar 2012 22:12:28 -0000 1.16
+++ minitube.spec 24 Aug 2012 06:49:36 -0000 1.17
@@ -1,6 +1,6 @@
Name: minitube
-Version: 1.7
-Release: 2%{?dist}
+Version: 1.8.0
+Release: 1%{?dist}
Summary: A YouTube desktop client
Group: Applications/Multimedia
@@ -34,10 +34,7 @@
Source0: http://flavio.tordini.org/files/%{name}/%{name}.tar.gz
# fixes requirement on bundled qtsingleapplication
Patch0: minitube-qtsingleapp.patch
-Patch1: minitube-1.7-translation.patch
-Patch2: minitube-1.7-updateCheckRemoval.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
+Patch1: minitube-1.8-1-disable-update-check.patch
BuildRequires: qt4-devel
BuildRequires: desktop-file-utils
@@ -45,15 +42,9 @@
BuildRequires: qtsingleapplication-devel
BuildRequires: gettext
Requires: hicolor-icon-theme
-
-# KDE 4.6.1 in fedora 15 defaults to phonon-backend-gstreamer
-# add gstreamer-ffmpeg as Required.
-%if 0%{?fedora} && 0%{?fedora} > 14
Requires: gstreamer-ffmpeg
-%else
-Requires: xine-lib-extras-freeworld
-%endif
+%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
%description
Minitube is a YouTube desktop client.
With it you can watch YouTube videos in a new way:
@@ -64,27 +55,11 @@
%prep
%setup -q -n %{name}
-# Fix spurious-executable-perm
-chmod -x src/*{h,cpp}
-
# remove bundled copy of qtsingleapplication
rm -rf src/qtsingleapplication
-# rename badly named translation files
-mv locale/sv_SE.ts locale/sv.ts
-mv locale/en_US.ts locale/en.ts
-mv locale/de_DE.ts locale/de.ts
-mv locale/fi_FI.ts locale/fi.ts
-mv locale/he_IL.ts locale/he.ts
-mv locale/ka_GE.ts locale/ka.ts
-mv locale/uk_UA.ts locale/uk.ts
-mv locale/zh_CN.ts locale/zh-temp.ts
-# we want that one^..
-# removing the rest
-rm -rf locale/*_*.ts
-mv locale/zh-temp.ts locale/zh_CN.ts
+
%patch0 -p 1
%patch1 -p 0
-%patch2 -p 0
%build
@@ -100,17 +75,15 @@
--delete-original \
%{buildroot}%{_datadir}/applications/%{name}.desktop
-# There is a bug in find-lang.sh (see BZ #729336)
-# heavily borrowed from /usr/lib/rpm/find-lang.sh
-find %{buildroot} -type f -o -type l|sort|sed '
-s:'"%{buildroot}"'::
-s:\(.*/locale/\)\([^/_]\+\)\(.*\.qm$\):%lang(\2) \1\2\3:
-s:^\([^%].*\)::
+# %%find_lang
+# There is a bug in find-lang.sh (see BZ #729336)
+# heavily borrowed from /usr/lib/rpm/find-lang.sh
+find %{buildroot} -type f -o -type l|sort|sed '
+s:'"%{buildroot}"'::
+s:\(.*/locale/\)\([^/_]\+\)\(.*\.qm$\):%lang(\2) \1\2\3:
+s:^\([^%].*\)::
/^$/d' > %{name}.lang
-%clean
-rm -rf %{buildroot}
-
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -124,14 +97,26 @@
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING LICENSE.LGPL CHANGES TODO INSTALL
+%doc AUTHORS COPYING LICENSE.LGPL CHANGES TODO
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+%dir %{_datadir}/%{name}/
+%dir %{_datadir}/%{name}/locale
%changelog
+* Fri Aug 24 2012 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.8.0-1
+- 1.8.0
+- clean spec file
+- disable-update-patch borrowed from debian
+
+* Fri Apr 12 2012 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.7.1-1
+- 1.7.1
+- removed INSTALL
+- own dir
+- removed legacy stuff from spec
+
* Fri Mar 02 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.7-2
- Rebuilt for c++ ABI breakage
Index: sources
===================================================================
RCS file: /cvs/free/rpms/minitube/F-18/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 6 Jan 2012 19:38:30 -0000 1.11
+++ sources 24 Aug 2012 06:49:36 -0000 1.12
@@ -1 +1 @@
-9a657616eaa32311296d41eb99717ec2 minitube.tar.gz
+dabfe4776ab6a19eff14e644f68714bb minitube.tar.gz
11 years, 9 months
rpms/minitube/devel minitube-1.8-1-disable-update-check.patch, NONE, 1.1 minitube.spec, 1.16, 1.17 sources, 1.11, 1.12
by Magnus Tuominen
Author: magnu5
Update of /cvs/free/rpms/minitube/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19867
Modified Files:
minitube.spec sources
Added Files:
minitube-1.8-1-disable-update-check.patch
Log Message:
* Fri Aug 24 2012 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.8.0-1
- 1.8.0
- clean spec file
- disable-update-patch borrowed from debian
minitube-1.8-1-disable-update-check.patch:
MainWindow.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE minitube-1.8-1-disable-update-check.patch ---
diff -up src/MainWindow.cpp.orig src/MainWindow.cpp
--- src/MainWindow.cpp.orig 2012-08-24 09:32:11.454026355 +0300
+++ src/MainWindow.cpp 2012-08-24 09:32:24.429901026 +0300
@@ -124,7 +124,7 @@ MainWindow::MainWindow() :
setAcceptDrops(true);
- QTimer::singleShot(0, this, SLOT(checkForUpdate()));
+ //QTimer::singleShot(0, this, SLOT(checkForUpdate()));
}
Index: minitube.spec
===================================================================
RCS file: /cvs/free/rpms/minitube/devel/minitube.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- minitube.spec 2 Mar 2012 22:12:28 -0000 1.16
+++ minitube.spec 24 Aug 2012 06:45:40 -0000 1.17
@@ -1,6 +1,6 @@
Name: minitube
-Version: 1.7
-Release: 2%{?dist}
+Version: 1.8.0
+Release: 1%{?dist}
Summary: A YouTube desktop client
Group: Applications/Multimedia
@@ -34,10 +34,7 @@
Source0: http://flavio.tordini.org/files/%{name}/%{name}.tar.gz
# fixes requirement on bundled qtsingleapplication
Patch0: minitube-qtsingleapp.patch
-Patch1: minitube-1.7-translation.patch
-Patch2: minitube-1.7-updateCheckRemoval.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
+Patch1: minitube-1.8-1-disable-update-check.patch
BuildRequires: qt4-devel
BuildRequires: desktop-file-utils
@@ -45,15 +42,9 @@
BuildRequires: qtsingleapplication-devel
BuildRequires: gettext
Requires: hicolor-icon-theme
-
-# KDE 4.6.1 in fedora 15 defaults to phonon-backend-gstreamer
-# add gstreamer-ffmpeg as Required.
-%if 0%{?fedora} && 0%{?fedora} > 14
Requires: gstreamer-ffmpeg
-%else
-Requires: xine-lib-extras-freeworld
-%endif
+%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
%description
Minitube is a YouTube desktop client.
With it you can watch YouTube videos in a new way:
@@ -64,27 +55,11 @@
%prep
%setup -q -n %{name}
-# Fix spurious-executable-perm
-chmod -x src/*{h,cpp}
-
# remove bundled copy of qtsingleapplication
rm -rf src/qtsingleapplication
-# rename badly named translation files
-mv locale/sv_SE.ts locale/sv.ts
-mv locale/en_US.ts locale/en.ts
-mv locale/de_DE.ts locale/de.ts
-mv locale/fi_FI.ts locale/fi.ts
-mv locale/he_IL.ts locale/he.ts
-mv locale/ka_GE.ts locale/ka.ts
-mv locale/uk_UA.ts locale/uk.ts
-mv locale/zh_CN.ts locale/zh-temp.ts
-# we want that one^..
-# removing the rest
-rm -rf locale/*_*.ts
-mv locale/zh-temp.ts locale/zh_CN.ts
+
%patch0 -p 1
%patch1 -p 0
-%patch2 -p 0
%build
@@ -100,17 +75,15 @@
--delete-original \
%{buildroot}%{_datadir}/applications/%{name}.desktop
-# There is a bug in find-lang.sh (see BZ #729336)
-# heavily borrowed from /usr/lib/rpm/find-lang.sh
-find %{buildroot} -type f -o -type l|sort|sed '
-s:'"%{buildroot}"'::
-s:\(.*/locale/\)\([^/_]\+\)\(.*\.qm$\):%lang(\2) \1\2\3:
-s:^\([^%].*\)::
+# %%find_lang
+# There is a bug in find-lang.sh (see BZ #729336)
+# heavily borrowed from /usr/lib/rpm/find-lang.sh
+find %{buildroot} -type f -o -type l|sort|sed '
+s:'"%{buildroot}"'::
+s:\(.*/locale/\)\([^/_]\+\)\(.*\.qm$\):%lang(\2) \1\2\3:
+s:^\([^%].*\)::
/^$/d' > %{name}.lang
-%clean
-rm -rf %{buildroot}
-
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -124,14 +97,26 @@
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING LICENSE.LGPL CHANGES TODO INSTALL
+%doc AUTHORS COPYING LICENSE.LGPL CHANGES TODO
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+%dir %{_datadir}/%{name}/
+%dir %{_datadir}/%{name}/locale
%changelog
+* Fri Aug 24 2012 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.8.0-1
+- 1.8.0
+- clean spec file
+- disable-update-patch borrowed from debian
+
+* Fri Apr 12 2012 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.7.1-1
+- 1.7.1
+- removed INSTALL
+- own dir
+- removed legacy stuff from spec
+
* Fri Mar 02 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.7-2
- Rebuilt for c++ ABI breakage
Index: sources
===================================================================
RCS file: /cvs/free/rpms/minitube/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 6 Jan 2012 19:38:30 -0000 1.11
+++ sources 24 Aug 2012 06:45:40 -0000 1.12
@@ -1 +1 @@
-9a657616eaa32311296d41eb99717ec2 minitube.tar.gz
+dabfe4776ab6a19eff14e644f68714bb minitube.tar.gz
11 years, 9 months
rpms/openafs/F-18 openafs-1.6.1-afsd-sys-resource-h.patch, NONE, 1.1 openafs-1.6.1-int31-partsize.patch, NONE, 1.1 openafs.spec, 1.24, 1.25
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25345
Modified Files:
openafs.spec
Added Files:
openafs-1.6.1-afsd-sys-resource-h.patch
openafs-1.6.1-int31-partsize.patch
Log Message:
* 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
- Upstream patch for fileserver partitions >2TB
openafs-1.6.1-afsd-sys-resource-h.patch:
afsd_kernel.c | 4 ++++
1 file changed, 4 insertions(+)
--- NEW FILE openafs-1.6.1-afsd-sys-resource-h.patch ---
commit 94a6a552ae8b45f02dd6a6a3a92907d355801eb1
Author: Marc Dionne <marc.c.dionne(a)gmail.com>
Date: Sat Jun 2 20:45:08 2012 -0400
afsd: include sys/resource.h in afsd_kernel.c
With a recent glibc update, sys/wait.h no longer includes
sys/resource.h unless __USE_SVID, __USE_XOPEN or __USE_XOPEN2K8
are set.
Don't rely on the indirect inclusion to get the bits we need;
include it directly in afsd_kernel.c. This include used to be
there but was dropped when afsd_kernel.c was split off.
Change-Id: I1bfd2e0c340e15ca44472aa89614f088e0c0ce0c
Reviewed-on: http://gerrit.openafs.org/7522
Tested-by: BuildBot <buildbot(a)rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow(a)dementix.org>
(cherry picked from commit bc3a32a84facb8114a8c7de87025f972d0281098)
Conflicts:
src/afsd/afsd_kernel.c
diff --git a/src/afsd/afsd_kernel.c b/src/afsd/afsd_kernel.c
index 1f7fdbb..3c7c6ee 100644
--- a/src/afsd/afsd_kernel.c
+++ b/src/afsd/afsd_kernel.c
@@ -33,6 +33,10 @@
#include <sys/wait.h>
+#if defined(AFS_LINUX20_ENV)
+#include <sys/resource.h>
+#endif
+
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
#endif
openafs-1.6.1-int31-partsize.patch:
afsfileprocs.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE openafs-1.6.1-int31-partsize.patch ---
commit a64864529d1fca2b5a3f4d21ec598982be335368
Author: Jeffrey Altman <jaltman(a)your-file-system.com>
Date: Mon Apr 2 22:35:41 2012 -0400
viced: AFSDisk, AFSFetchVolumeStatus Int31 PartSize
The AFSDisk and AFSFetchVolumeStatus structures use signed
32-bit integers for representation partition size and
available blocks. RoundInt64ToInt31() should be used instead
of RoundInt64ToInt32() when assigning their values.
Change-Id: I3834141fce2d54ce8bdfac3dc566074583bb305e
Reviewed-on: http://gerrit.openafs.org/7022
Reviewed-by: Derrick Brashear <shadow(a)dementix.org>
Tested-by: Derrick Brashear <shadow(a)dementix.org>
(cherry picked from commit e8f6dfac59fe042a04a9ac5eb3c37356cb3a22a3)
Reviewed-on: http://gerrit.openafs.org/7023
Reviewed-by: Jeffrey Altman <jaltman(a)secure-endpoints.com>
Tested-by: Jeffrey Altman <jaltman(a)secure-endpoints.com>
diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c
index 17224b9..2314976 100644
--- a/src/viced/afsfileprocs.c
+++ b/src/viced/afsfileprocs.c
@@ -2045,8 +2045,8 @@ RXGetVolumeStatus(AFSFetchVolumeStatus * status, char **name, char **offMsg,
status->MinQuota = V_minquota(volptr);
status->MaxQuota = V_maxquota(volptr);
status->BlocksInUse = V_diskused(volptr);
- status->PartBlocksAvail = RoundInt64ToInt32(volptr->partition->free);
- status->PartMaxBlocks = RoundInt64ToInt32(volptr->partition->totalUsable);
+ status->PartBlocksAvail = RoundInt64ToInt31(volptr->partition->free);
+ status->PartMaxBlocks = RoundInt64ToInt31(volptr->partition->totalUsable);
/* now allocate and copy these things; they're freed by the RXGEN stub */
temp = strlen(V_name(volptr)) + 1;
@@ -5741,8 +5741,8 @@ SetVolumeStats(struct AFSStatistics *stats)
for (part = DiskPartitionList; part && i < AFS_MSTATDISKS;
part = part->next) {
- stats->Disks[i].TotalBlocks = RoundInt64ToInt32(part->totalUsable);
- stats->Disks[i].BlocksAvailable = RoundInt64ToInt32(part->free);
+ stats->Disks[i].TotalBlocks = RoundInt64ToInt31(part->totalUsable);
+ stats->Disks[i].BlocksAvailable = RoundInt64ToInt31(part->free);
memset(stats->Disks[i].Name, 0, AFS_DISKNAMESIZE);
strncpy(stats->Disks[i].Name, part->name, AFS_DISKNAMESIZE);
i++;
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/F-18/openafs.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- openafs.spec 1 May 2012 22:33:23 -0000 1.24
+++ openafs.spec 23 Aug 2012 18:48:27 -0000 1.25
@@ -13,7 +13,7 @@
Summary: Enterprise Network File System
Name: openafs
Version: 1.6.1
-Release: 2%{?dist}
+Release: 4%{?dist}
License: IBM
Group: System Environment/Daemons
URL: http://www.openafs.org
@@ -29,6 +29,12 @@
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
+# Upstream patch to compile with newer glibc
+# (not yet on openafs-stable-1_6_x; cherry-picked from master)
+Patch2: openafs-1.6.1-afsd-sys-resource-h.patch
+
%description
The AFS distributed filesystem. AFS is a distributed filesystem
@@ -96,6 +102,12 @@
# This changes osconf.m4 to build with -fPIC on i386 and x86_64
%patch0
+# This allows fileservers to serve data from partition sizes greater than 2TB.
+%patch1 -p1
+
+# This allows us to build with newer glibc
+%patch2 -p1
+
# Convert the licese to UTF-8
mv src/LICENSE src/LICENSE~
iconv -f ISO-8859-1 -t UTF8 src/LICENSE~ > src/LICENSE
@@ -324,6 +336,12 @@
%{_datadir}/openafs/C/afszcm.cat
%changelog
+* 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
+- Upstream patch for fileserver partitions >2TB
+
* Mon May 01 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-2
- Provide openafs-static (RPM Fusion bug #2310).
11 years, 9 months
rpms/openafs/devel afs.conf,1.3,1.4 openafs.spec,1.26,1.27
by Jack Neely
Author: jjneely
Update of /cvs/free/rpms/openafs/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25093
Modified Files:
afs.conf openafs.spec
Log Message:
* 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
Index: afs.conf
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/afs.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- afs.conf 8 Mar 2012 21:11:39 -0000 1.3
+++ afs.conf 23 Aug 2012 18:44:01 -0000 1.4
@@ -13,10 +13,13 @@
AFS_SERVER=off
# AFS client configuration options:
-LARGE="-stat 2800 -dcache 2400 -daemons 5 -volumes 128"
-MEDIUM="-stat 2000 -dcache 800 -daemons 3 -volumes 70"
-SMALL="-stat 300 -dcache 100 -daemons 2 -volumes 50"
-OPTIONS="$MEDIUM -nosettime -memcache -afsdb -dynroot"
+# A "normal" memcache based default. 20MB of cache
+NORMAL="-memcache -daemons 3 -blocks 20480"
+# A "server" doing heavier AFS I/O: disk cache, set cache size in
+# /etc/openafs/cacheinfo
+SERVER="-daemons 5 -chunksize 18 -volumes 512"
+
+OPTIONS="$NORMAL -nosettime -afsdb -dynroot -fakestat"
# Set some sane sysnames -- figure out what we are
_ARCH=`uname -i | sed 's/x86_64/amd64/'`
@@ -52,16 +55,19 @@
# /usr/afsws/etc/fs setserverprefs <host> <rank>
#}
+afs_post_init() {
+ /usr/bin/fs setcrypt -crypt on
+}
+
# Either the name of an executable script or a set of commands go here.
# AFS_POST_INIT=afs_serverprefs
-AFS_POST_INIT=
-
+AFS_POST_INIT=afs_post_init
# Directory to mount AFS under (usually /afs)
AFS_MOUNT_POINT="/afs"
# Directory to use for the cache directory
-AFS_CACHE_DIR=""
+AFS_CACHE_DIR="/var/cache/openafs"
# Directory to use for configuration information
AFS_CONF_DIR="/etc/openafs"
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/openafs.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- openafs.spec 23 Aug 2012 01:02:51 -0000 1.26
+++ openafs.spec 23 Aug 2012 18:44:01 -0000 1.27
@@ -13,7 +13,7 @@
Summary: Enterprise Network File System
Name: openafs
Version: 1.6.1
-Release: 4%{?dist}
+Release: 5%{?dist}
License: IBM
Group: System Environment/Daemons
URL: http://www.openafs.org
@@ -336,6 +336,12 @@
%{_datadir}/openafs/C/afszcm.cat
%changelog
+* 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
11 years, 9 months
rpms/openafs/F-17 afs.conf,1.3,1.4 openafs.spec,1.24,1.25
by Jack Neely
Author: jjneely
Update of /cvs/free/rpms/openafs/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25021
Modified Files:
afs.conf openafs.spec
Log Message:
* Thu Aug 23 2012 Jack Neely <jjneely(a)ncsu.edu> 0:1.6.1-4
- 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
Index: afs.conf
===================================================================
RCS file: /cvs/free/rpms/openafs/F-17/afs.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- afs.conf 8 Mar 2012 22:59:16 -0000 1.3
+++ afs.conf 23 Aug 2012 18:43:28 -0000 1.4
@@ -13,10 +13,13 @@
AFS_SERVER=off
# AFS client configuration options:
-LARGE="-stat 2800 -dcache 2400 -daemons 5 -volumes 128"
-MEDIUM="-stat 2000 -dcache 800 -daemons 3 -volumes 70"
-SMALL="-stat 300 -dcache 100 -daemons 2 -volumes 50"
-OPTIONS="$MEDIUM -nosettime -memcache -afsdb -dynroot"
+# A "normal" memcache based default. 20MB of cache
+NORMAL="-memcache -daemons 3 -blocks 20480"
+# A "server" doing heavier AFS I/O: disk cache, set cache size in
+# /etc/openafs/cacheinfo
+SERVER="-daemons 5 -chunksize 18 -volumes 512"
+
+OPTIONS="$NORMAL -nosettime -afsdb -dynroot -fakestat"
# Set some sane sysnames -- figure out what we are
_ARCH=`uname -i | sed 's/x86_64/amd64/'`
@@ -52,16 +55,19 @@
# /usr/afsws/etc/fs setserverprefs <host> <rank>
#}
+afs_post_init() {
+ /usr/bin/fs setcrypt -crypt on
+}
+
# Either the name of an executable script or a set of commands go here.
# AFS_POST_INIT=afs_serverprefs
-AFS_POST_INIT=
-
+AFS_POST_INIT=afs_post_init
# Directory to mount AFS under (usually /afs)
AFS_MOUNT_POINT="/afs"
# Directory to use for the cache directory
-AFS_CACHE_DIR=""
+AFS_CACHE_DIR="/var/cache/openafs"
# Directory to use for configuration information
AFS_CONF_DIR="/etc/openafs"
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/F-17/openafs.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- openafs.spec 22 Aug 2012 20:28:51 -0000 1.24
+++ openafs.spec 23 Aug 2012 18:43:28 -0000 1.25
@@ -13,7 +13,7 @@
Summary: Enterprise Network File System
Name: openafs
Version: 1.6.1
-Release: 3%{?dist}
+Release: 4%{?dist}
License: IBM
Group: System Environment/Daemons
URL: http://www.openafs.org
@@ -329,6 +329,12 @@
%{_datadir}/openafs/C/afszcm.cat
%changelog
+* Thu Aug 23 2012 Jack Neely <jjneely(a)ncsu.edu> 0:1.6.1-4
+- 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-3
- Upstream patch for fileserver partitions >2TB
11 years, 9 months
rpms/openafs/devel openafs-1.6.1-afsd-sys-resource-h.patch, NONE, 1.1 openafs.spec, 1.25, 1.26
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19436
Modified Files:
openafs.spec
Added Files:
openafs-1.6.1-afsd-sys-resource-h.patch
Log Message:
* Wed Aug 22 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-4
- Upstream patch for new glibc
openafs-1.6.1-afsd-sys-resource-h.patch:
afsd_kernel.c | 4 ++++
1 file changed, 4 insertions(+)
--- NEW FILE openafs-1.6.1-afsd-sys-resource-h.patch ---
commit 94a6a552ae8b45f02dd6a6a3a92907d355801eb1
Author: Marc Dionne <marc.c.dionne(a)gmail.com>
Date: Sat Jun 2 20:45:08 2012 -0400
afsd: include sys/resource.h in afsd_kernel.c
With a recent glibc update, sys/wait.h no longer includes
sys/resource.h unless __USE_SVID, __USE_XOPEN or __USE_XOPEN2K8
are set.
Don't rely on the indirect inclusion to get the bits we need;
include it directly in afsd_kernel.c. This include used to be
there but was dropped when afsd_kernel.c was split off.
Change-Id: I1bfd2e0c340e15ca44472aa89614f088e0c0ce0c
Reviewed-on: http://gerrit.openafs.org/7522
Tested-by: BuildBot <buildbot(a)rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow(a)dementix.org>
(cherry picked from commit bc3a32a84facb8114a8c7de87025f972d0281098)
Conflicts:
src/afsd/afsd_kernel.c
diff --git a/src/afsd/afsd_kernel.c b/src/afsd/afsd_kernel.c
index 1f7fdbb..3c7c6ee 100644
--- a/src/afsd/afsd_kernel.c
+++ b/src/afsd/afsd_kernel.c
@@ -33,6 +33,10 @@
#include <sys/wait.h>
+#if defined(AFS_LINUX20_ENV)
+#include <sys/resource.h>
+#endif
+
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
#endif
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/openafs.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- openafs.spec 22 Aug 2012 20:19:22 -0000 1.25
+++ openafs.spec 23 Aug 2012 01:02:51 -0000 1.26
@@ -13,7 +13,7 @@
Summary: Enterprise Network File System
Name: openafs
Version: 1.6.1
-Release: 3%{?dist}
+Release: 4%{?dist}
License: IBM
Group: System Environment/Daemons
URL: http://www.openafs.org
@@ -31,6 +31,10 @@
Patch0: openafs-1.6.0-fPIC.patch
# Upstream patch to fix fileservers with >2TB partitions
Patch1: openafs-1.6.1-int31-partsize.patch
+# Upstream patch to compile with newer glibc
+# (not yet on openafs-stable-1_6_x; cherry-picked from master)
+Patch2: openafs-1.6.1-afsd-sys-resource-h.patch
+
%description
The AFS distributed filesystem. AFS is a distributed filesystem
@@ -101,6 +105,9 @@
# This allows fileservers to serve data from partition sizes greater than 2TB.
%patch1 -p1
+# This allows us to build with newer glibc
+%patch2 -p1
+
# Convert the licese to UTF-8
mv src/LICENSE src/LICENSE~
iconv -f ISO-8859-1 -t UTF8 src/LICENSE~ > src/LICENSE
@@ -329,6 +336,9 @@
%{_datadir}/openafs/C/afszcm.cat
%changelog
+* 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
- Upstream patch for fileserver partitions >2TB
11 years, 9 months
rpms/wl-kmod/F-17 wl-kmod.spec,1.83,1.84
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/wl-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12766
Modified Files:
wl-kmod.spec
Log Message:
* Wed Aug 22 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-3.11
- Rebuilt for updated kernel
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-17/wl-kmod.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- wl-kmod.spec 16 Aug 2012 18:08:20 -0000 1.83
+++ wl-kmod.spec 22 Aug 2012 22:12:18 -0000 1.84
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 5.100.82.112
-Release: 3%{?dist}.10
+Release: 3%{?dist}.11
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -85,6 +85,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Aug 22 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-3.11
+- Rebuilt for updated kernel
+
* Thu Aug 16 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-3.10
- Rebuilt for updated kernel
11 years, 9 months
rpms/nvidia-kmod/F-17 nvidia-kmod.spec,1.127,1.128
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12642
Modified Files:
nvidia-kmod.spec
Log Message:
* Wed Aug 22 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:304.37-1.2
- Rebuilt for updated kernel
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-17/nvidia-kmod.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- nvidia-kmod.spec 16 Aug 2012 18:08:05 -0000 1.127
+++ nvidia-kmod.spec 22 Aug 2012 22:12:10 -0000 1.128
@@ -9,7 +9,7 @@
Epoch: 1
Version: 304.37
# Taken over by kmodtool
-Release: 1%{?dist}.1
+Release: 1%{?dist}.2
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -77,6 +77,9 @@
%changelog
+* Wed Aug 22 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:304.37-1.2
+- Rebuilt for updated kernel
+
* Thu Aug 16 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:304.37-1.1
- Rebuilt for updated kernel
11 years, 9 months
rpms/nvidia-173xx-kmod/F-17 nvidia-173xx-kmod.spec,1.61,1.62
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-173xx-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12508
Modified Files:
nvidia-173xx-kmod.spec
Log Message:
* Wed Aug 22 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.35-1.10
- Rebuilt for updated kernel
Index: nvidia-173xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/F-17/nvidia-173xx-kmod.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- nvidia-173xx-kmod.spec 16 Aug 2012 18:07:50 -0000 1.61
+++ nvidia-173xx-kmod.spec 22 Aug 2012 22:11:59 -0000 1.62
@@ -8,7 +8,7 @@
Name: nvidia-173xx-kmod
Version: 173.14.35
# Taken over by kmodtool
-Release: 1%{?dist}.9
+Release: 1%{?dist}.10
Summary: NVIDIA 173xx display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -93,6 +93,9 @@
%changelog
+* Wed Aug 22 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.35-1.10
+- Rebuilt for updated kernel
+
* Thu Aug 16 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.35-1.9
- Rebuilt for updated kernel
11 years, 9 months