[kernel] Linux v3.9-4516-gc9ef713
by Josh Boyer
commit 2f0dc63fe0e69aa6b9496d5dccd157f99a985db7
Author: Josh Boyer <jwboyer(a)redhat.com>
Date: Tue Apr 30 14:08:17 2013 -0400
Linux v3.9-4516-gc9ef713
config-generic | 2 ++
debug-bad-pte-modules.patch | 25 +++++++++++++++++--------
kernel.spec | 5 ++++-
sources | 2 +-
4 files changed, 24 insertions(+), 10 deletions(-)
---
diff --git a/config-generic b/config-generic
index 3e96d36..b46401e 100644
--- a/config-generic
+++ b/config-generic
@@ -2748,6 +2748,7 @@ CONFIG_DVB_BUDGET_CORE=m
CONFIG_DVB_PLUTO2=m
CONFIG_SMS_SIANO_MDTV=m
CONFIG_SMS_SIANO_RC=y
+# CONFIG_SMS_SIANO_DEBUGFS is not set
CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
CONFIG_SMS_USB_DRV=m
CONFIG_SMS_SDIO_DRV=m
@@ -3288,6 +3289,7 @@ CONFIG_HID_SAITEK=m
CONFIG_HID_TIVO=m
CONFIG_HID_GENERIC=y
CONFIG_HID_AUREAL=m
+CONFIG_HID_APPLEIR=m
#
diff --git a/debug-bad-pte-modules.patch b/debug-bad-pte-modules.patch
index 0472310..8dbf6db 100644
--- a/debug-bad-pte-modules.patch
+++ b/debug-bad-pte-modules.patch
@@ -1,11 +1,18 @@
-When we encounter a bad PTE, print out what modules were loaded,
-so we can see if there is a common driver potentially at fault.
+From 3cd4fefa1d614debf75f059def34ac1aaaf96501 Mon Sep 17 00:00:00 2001
+From: Josh Boyer <jwboyer(a)redhat.com>
+Date: Tue, 30 Apr 2013 14:01:57 -0400
+Subject: [PATCH] When we encounter a bad PTE, print out what modules were
+ loaded, so we can see if there is a common driver potentially at fault.
Signed-off-by: Dave Jones <davej(a)redhat.com>
+---
+ mm/memory.c | 2 ++
+ 1 file changed, 2 insertions(+)
-diff -durpN '--exclude-from=/home/davej/.exclude' /home/davej/src/kernel/git-trees/linux/mm/memory.c linux-dj/mm/memory.c
---- /home/davej/src/kernel/git-trees/linux/mm/memory.c 2013-02-26 14:41:18.591116577 -0500
-+++ linux-dj/mm/memory.c 2013-02-28 20:04:37.678304092 -0500
+diff --git a/mm/memory.c b/mm/memory.c
+index 6dc1882..99564df 100644
+--- a/mm/memory.c
++++ b/mm/memory.c
@@ -57,6 +57,7 @@
#include <linux/swapops.h>
#include <linux/elf.h>
@@ -14,12 +21,14 @@ diff -durpN '--exclude-from=/home/davej/.exclude' /home/davej/src/kernel/git-tre
#include <linux/migrate.h>
#include <linux/string.h>
-@@ -719,6 +722,7 @@ static void print_bad_pte(struct vm_area
+@@ -720,6 +721,7 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr,
if (vma->vm_file && vma->vm_file->f_op)
- print_symbol(KERN_ALERT "vma->vm_file->f_op->mmap: %s\n",
- (unsigned long)vma->vm_file->f_op->mmap);
+ printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pSR\n",
+ vma->vm_file->f_op->mmap);
+ print_modules();
dump_stack();
add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);
}
+--
+1.8.1.4
diff --git a/kernel.spec b/kernel.spec
index 5bca1df..ac9681b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -95,7 +95,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 0
# The git snapshot level
-%define gitrev 5
+%define gitrev 6
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -2290,6 +2290,9 @@ fi
# ||----w |
# || ||
%changelog
+* Tue Apr 30 2013 Josh Boyer <jwboyer(a)redhat.com> - 3.10.0-0.rc0.git6.1
+- Linux v3.9-4516-gc9ef713
+
* Tue Apr 30 2013 Josh Boyer <jwboyer(a)redhat.com> - 3.10.0-0.rc0.git5.1
- Linux v3.9-3520-g5a5a1bf
diff --git a/sources b/sources
index 7fa5b97..5e576c8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
4348c9b6b2eb3144d601e87c19d5d909 linux-3.9.tar.xz
-5e4a52d1e51f5dc0f218d82f0a08269c patch-3.9-git5.xz
+2c14066053833a16f1fe9dccddf0dfb6 patch-3.9-git6.xz
9Â years
[git] use systemd instead of xinetd (bz 737183)
by Tom Callaway
commit d7389e7fc0880e68b829e664148e742f4f3d3a96
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Tue Apr 30 14:25:37 2013 -0400
use systemd instead of xinetd (bz 737183)
git.service | 9 +++++++++
git.socket | 9 +++++++++
git.spec | 39 +++++++++++++++++++++++++--------------
3 files changed, 43 insertions(+), 14 deletions(-)
---
diff --git a/git.service b/git.service
new file mode 100644
index 0000000..07cbe6e
--- /dev/null
+++ b/git.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Git Repositories Server Daemon
+Documentation=man:git-daemon(1)
+Wants=git.socket
+
+[Service]
+User=nobody
+ExecStart=/usr/libexec/git-core/git-daemon --base-path=/var/lib/git --export-all --user-path=public_git --syslog --inetd --verbose
+StandardInput=socket
diff --git a/git.socket b/git.socket
new file mode 100644
index 0000000..3dec01d
--- /dev/null
+++ b/git.socket
@@ -0,0 +1,9 @@
+[Unit]
+Description=Git Activation Socket
+
+[Socket]
+ListenStream=9418
+Accept=true
+
+[Install]
+WantedBy=sockets.target
diff --git a/git.spec b/git.spec
index 5a1966b..e23a4c2 100644
--- a/git.spec
+++ b/git.spec
@@ -44,19 +44,20 @@
Name: git
Version: 1.8.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Fast Version Control System
License: GPLv2
Group: Development/Tools
URL: http://git-scm.com/
Source0: http://git-core.googlecode.com/files/%{name}-%{version}.tar.gz
Source2: git-init.el
-Source3: git.xinetd.in
Source4: git.conf.httpd
Source5: git-gui.desktop
Source6: gitweb.conf.in
Source10: http://git-core.googlecode.com/files/%{name}-manpages-%{version}.tar.gz
Source11: http://git-core.googlecode.com/files/%{name}-htmldocs-%{version}.tar.gz
+Source12: git.service
+Source13: git.socket
Patch0: git-1.5-gitweb-home-link.patch
# https://bugzilla.redhat.com/490602
Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch
@@ -84,6 +85,8 @@ BuildRequires: libgnome-keyring-devel
BuildRequires: pcre-devel
BuildRequires: openssl-devel
BuildRequires: zlib-devel >= 1.2
+# For macros
+BuildRequires: systemd
Requires: less
Requires: openssh-clients
@@ -93,6 +96,10 @@ Requires: perl-Git = %{version}-%{release}
Requires: rsync
Requires: zlib >= 1.2
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
+
Provides: git-core = %{version}-%{release}
Obsoletes: git-core <= 1.5.4.3
@@ -409,17 +416,8 @@ rm -rf %{buildroot}%{_mandir}
%endif
mkdir -p %{buildroot}%{_var}/lib/git
-mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d
-# On EL <= 5, xinetd does not enable IPv6 by default
-enable_ipv6=" # xinetd does not enable IPv6 by default
- flags = IPv6"
-perl -p \
- -e "s|\@GITCOREDIR\@|%{gitcoredir}|g;" \
- -e "s|\@BASE_PATH\@|%{_var}/lib/git|g;" \
-%if %{enable_ipv6}
- -e "s|^}|$enable_ipv6\n$&|;" \
-%endif
- %{SOURCE3} > %{buildroot}%{_sysconfdir}/xinetd.d/git
+mkdir -p %{buildroot}%{_unitdir}
+cp -a %{SOURCE12} %{SOURCE13} %{buildroot}%{_unitdir}
# Setup bash completion
mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
@@ -465,6 +463,15 @@ find contrib -type f | xargs chmod -x
%clean
rm -rf %{buildroot}
+%post daemon
+%systemd_post git.service
+
+%preun daemon
+%systemd_preun git.service
+
+%postun
+%systemd_postun_with_restart git.service
+
%files -f bin-man-doc-files
%defattr(-,root,root)
@@ -546,7 +553,8 @@ rm -rf %{buildroot}
%files daemon
%defattr(-,root,root)
%doc Documentation/*daemon*.txt
-%config(noreplace)%{_sysconfdir}/xinetd.d/git
+%{_unitdir}/git.socket
+%{_unitdir}/git.service
%{gitcoredir}/git-daemon
%{_var}/lib/git
%{!?_without_docs: %{_mandir}/man1/*daemon*.1*}
@@ -564,6 +572,9 @@ rm -rf %{buildroot}
# No files for you!
%changelog
+* Tue Apr 30 2013 Tom Callaway <spot(a)fedoraproject.org> - 1.8.2.1-2
+- switch to systemd instead of xinetd (bz 737183)
+
* Sun Apr 14 2013 Todd Zullinger <tmz(a)pobox.com> - 1.8.2.1-1
- Update to 1.8.2.1
- Exclude optional perl(YAML::Any) dependency on EL-5
9Â years
[git/f19] use systemd instead of xinetd (bz 737183)
by Tom Callaway
commit f2638953c59809e916ba979ac1f9b87abf8010c2
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Tue Apr 30 14:25:22 2013 -0400
use systemd instead of xinetd (bz 737183)
git.service | 9 +++++++++
git.socket | 9 +++++++++
git.spec | 39 +++++++++++++++++++++++++--------------
3 files changed, 43 insertions(+), 14 deletions(-)
---
diff --git a/git.service b/git.service
new file mode 100644
index 0000000..07cbe6e
--- /dev/null
+++ b/git.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Git Repositories Server Daemon
+Documentation=man:git-daemon(1)
+Wants=git.socket
+
+[Service]
+User=nobody
+ExecStart=/usr/libexec/git-core/git-daemon --base-path=/var/lib/git --export-all --user-path=public_git --syslog --inetd --verbose
+StandardInput=socket
diff --git a/git.socket b/git.socket
new file mode 100644
index 0000000..3dec01d
--- /dev/null
+++ b/git.socket
@@ -0,0 +1,9 @@
+[Unit]
+Description=Git Activation Socket
+
+[Socket]
+ListenStream=9418
+Accept=true
+
+[Install]
+WantedBy=sockets.target
diff --git a/git.spec b/git.spec
index 5a1966b..e23a4c2 100644
--- a/git.spec
+++ b/git.spec
@@ -44,19 +44,20 @@
Name: git
Version: 1.8.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Fast Version Control System
License: GPLv2
Group: Development/Tools
URL: http://git-scm.com/
Source0: http://git-core.googlecode.com/files/%{name}-%{version}.tar.gz
Source2: git-init.el
-Source3: git.xinetd.in
Source4: git.conf.httpd
Source5: git-gui.desktop
Source6: gitweb.conf.in
Source10: http://git-core.googlecode.com/files/%{name}-manpages-%{version}.tar.gz
Source11: http://git-core.googlecode.com/files/%{name}-htmldocs-%{version}.tar.gz
+Source12: git.service
+Source13: git.socket
Patch0: git-1.5-gitweb-home-link.patch
# https://bugzilla.redhat.com/490602
Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch
@@ -84,6 +85,8 @@ BuildRequires: libgnome-keyring-devel
BuildRequires: pcre-devel
BuildRequires: openssl-devel
BuildRequires: zlib-devel >= 1.2
+# For macros
+BuildRequires: systemd
Requires: less
Requires: openssh-clients
@@ -93,6 +96,10 @@ Requires: perl-Git = %{version}-%{release}
Requires: rsync
Requires: zlib >= 1.2
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
+
Provides: git-core = %{version}-%{release}
Obsoletes: git-core <= 1.5.4.3
@@ -409,17 +416,8 @@ rm -rf %{buildroot}%{_mandir}
%endif
mkdir -p %{buildroot}%{_var}/lib/git
-mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d
-# On EL <= 5, xinetd does not enable IPv6 by default
-enable_ipv6=" # xinetd does not enable IPv6 by default
- flags = IPv6"
-perl -p \
- -e "s|\@GITCOREDIR\@|%{gitcoredir}|g;" \
- -e "s|\@BASE_PATH\@|%{_var}/lib/git|g;" \
-%if %{enable_ipv6}
- -e "s|^}|$enable_ipv6\n$&|;" \
-%endif
- %{SOURCE3} > %{buildroot}%{_sysconfdir}/xinetd.d/git
+mkdir -p %{buildroot}%{_unitdir}
+cp -a %{SOURCE12} %{SOURCE13} %{buildroot}%{_unitdir}
# Setup bash completion
mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
@@ -465,6 +463,15 @@ find contrib -type f | xargs chmod -x
%clean
rm -rf %{buildroot}
+%post daemon
+%systemd_post git.service
+
+%preun daemon
+%systemd_preun git.service
+
+%postun
+%systemd_postun_with_restart git.service
+
%files -f bin-man-doc-files
%defattr(-,root,root)
@@ -546,7 +553,8 @@ rm -rf %{buildroot}
%files daemon
%defattr(-,root,root)
%doc Documentation/*daemon*.txt
-%config(noreplace)%{_sysconfdir}/xinetd.d/git
+%{_unitdir}/git.socket
+%{_unitdir}/git.service
%{gitcoredir}/git-daemon
%{_var}/lib/git
%{!?_without_docs: %{_mandir}/man1/*daemon*.1*}
@@ -564,6 +572,9 @@ rm -rf %{buildroot}
# No files for you!
%changelog
+* Tue Apr 30 2013 Tom Callaway <spot(a)fedoraproject.org> - 1.8.2.1-2
+- switch to systemd instead of xinetd (bz 737183)
+
* Sun Apr 14 2013 Todd Zullinger <tmz(a)pobox.com> - 1.8.2.1-1
- Update to 1.8.2.1
- Exclude optional perl(YAML::Any) dependency on EL-5
9Â years
[glusterfs/el5] (6 commits) ...glusterfs-3.3.1-14, added multi-volume fix/support for G4S/UFO
by Kaleb KEITHLEY
Summary of changes:
3d0cab2... prerelease 3.4.0alpha3 for oVirt/vdsm dependencies in Fedor (*)
0d92f77... RHEL6 still needs the patches applied, even with grizzly, r (*)
956b8e0... glusterfs-3.4.0-0.2alpha3, take two (*)
a272e1f... glusterfs-3.4.0-02alpha3 take 3 (*)
066251b... fix an erroneous #else to %else, a twisty maze of passages, (*)
d7cec69... glusterfs-3.3.1-14, added multi-volume fix/support for G4S/ (*)
(*) This commit already existed in another branch; no separate mail sent
9Â years
[paraview/f19] Drop vendor tag.
by Jon Ciesla
Summary of changes:
5f795c6... Drop vendor tag. (*)
(*) This commit already existed in another branch; no separate mail sent
9Â years