rpms/upx/F-8 sources,1.7,1.8 upx.spec,1.15,1.16
by fedora-extras-commitsï¼ redhat.com
Author: limb
Update of /cvs/pkgs/rpms/upx/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32760
Modified Files:
sources upx.spec
Log Message:
3.02, upstream bugfixes.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/upx/F-8/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 6 Aug 2007 17:03:47 -0000 1.7
+++ sources 31 Dec 2007 13:57:28 -0000 1.8
@@ -1 +1 @@
-58f3c87bf7e067ece5f7c510d4423cb8 upx-3.01-src.tar.bz2
+6188a7cdf1e81a61c2cad90362c4d99d upx-3.02-src.tar.bz2
Index: upx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/upx/F-8/upx.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- upx.spec 16 Aug 2007 13:26:20 -0000 1.15
+++ upx.spec 31 Dec 2007 13:57:29 -0000 1.16
@@ -1,6 +1,6 @@
Name: upx
-Version: 3.01
-Release: 2%{?dist}
+Version: 3.02
+Release: 1%{?dist}
Summary: Ultimate Packer for eXecutables
Group: Applications/Archiving
@@ -48,6 +48,9 @@
%changelog
+* Mon Dec 31 2007 Jon Ciesla <limb(a)jcomserv.net> - 3.02-1
+- 3.02.
+
* Thu Aug 16 2007 Jon Ciesla <limb(a)jcomserv.net> - 3.01-2
- License tag correction.
16Â years, 3Â months
rpms/callweaver/devel callweaver.spec,1.9,1.10
by fedora-extras-commitsï¼ redhat.com
Author: dwmw2
Update of /cvs/pkgs/rpms/callweaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32751
Modified Files:
callweaver.spec
Log Message:
remove ODBC subpackage
Index: callweaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/callweaver/devel/callweaver.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- callweaver.spec 31 Dec 2007 13:34:52 -0000 1.9
+++ callweaver.spec 31 Dec 2007 13:57:17 -0000 1.10
@@ -23,7 +23,7 @@
BuildRequires: unixODBC-devel openssl-devel speex-devel alsa-lib-devel
BuildRequires: isdn4k-utils-devel libcap-devel sqlite-devel mysql-devel
BuildRequires: postgresql-devel readline-devel %{?with_misdn:mISDN-devel}
-BuildRequires: popt %{?with_zaptel:zaptel-devel libpri-devel}
+BuildRequires: popt-devel %{?with_zaptel:zaptel-devel libpri-devel}
Requires: /sbin/chkconfig
Obsoletes: openpbx < 1.2-5
@@ -319,10 +319,10 @@
%{_libdir}/callweaver/modules/*mysql.so
%config(noreplace) %attr(0644,callweaver,callweaver) %{_sysconfdir}/callweaver/*mysql.conf
-%files odbc
-%{_libdir}/callweaver/modules/cdr_odbc.so
-%config(noreplace) %attr(0644,callweaver,callweaver) %{_sysconfdir}/callweaver/cdr_odbc.conf
-%doc doc2/README.odbcstorage
+#%files odbc
+#%{_libdir}/callweaver/modules/cdr_odbc.so
+#%config(noreplace) %attr(0644,callweaver,callweaver) %{_sysconfdir}/callweaver/cdr_odbc.conf
+#%doc doc2/README.odbcstorage
%files ldap
%{_libdir}/callweaver/modules/app_ldap.so
@@ -373,6 +373,7 @@
%changelog
* Mon Dec 31 2007 David Woodhouse <dwmw2(a)infradead.org> 1.2-0.4.rc5.20071230
- Update, rebuild for deps
+- Disable ODBC
* Thu Aug 23 2007 David Woodhouse <dwmw2(a)infradead.org> 1.2-0.3.rc4.20070822
- Handle open() being a macro
16Â years, 3Â months
rpms/upx/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 upx.spec, 1.15, 1.16
by fedora-extras-commitsï¼ redhat.com
Author: limb
Update of /cvs/pkgs/rpms/upx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32620
Modified Files:
.cvsignore sources upx.spec
Log Message:
3.02.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/upx/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 6 Aug 2007 17:03:47 -0000 1.7
+++ .cvsignore 31 Dec 2007 13:49:20 -0000 1.8
@@ -1 +1 @@
-upx-3.01-src.tar.bz2
+upx-3.02-src.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/upx/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 6 Aug 2007 17:03:47 -0000 1.7
+++ sources 31 Dec 2007 13:49:20 -0000 1.8
@@ -1 +1 @@
-58f3c87bf7e067ece5f7c510d4423cb8 upx-3.01-src.tar.bz2
+6188a7cdf1e81a61c2cad90362c4d99d upx-3.02-src.tar.bz2
Index: upx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/upx/devel/upx.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- upx.spec 16 Aug 2007 13:26:20 -0000 1.15
+++ upx.spec 31 Dec 2007 13:49:20 -0000 1.16
@@ -1,6 +1,6 @@
Name: upx
-Version: 3.01
-Release: 2%{?dist}
+Version: 3.02
+Release: 1%{?dist}
Summary: Ultimate Packer for eXecutables
Group: Applications/Archiving
@@ -48,6 +48,9 @@
%changelog
+* Mon Dec 31 2007 Jon Ciesla <limb(a)jcomserv.net> - 3.02-1
+- 3.02.
+
* Thu Aug 16 2007 Jon Ciesla <limb(a)jcomserv.net> - 3.01-2
- License tag correction.
16Â years, 3Â months
rpms/callweaver/devel callweaver.spec,1.8,1.9
by fedora-extras-commitsï¼ redhat.com
Author: dwmw2
Update of /cvs/pkgs/rpms/callweaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32475
Modified Files:
callweaver.spec
Log Message:
remove defunct patches
Index: callweaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/callweaver/devel/callweaver.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- callweaver.spec 31 Dec 2007 13:33:53 -0000 1.8
+++ callweaver.spec 31 Dec 2007 13:34:52 -0000 1.9
@@ -14,8 +14,6 @@
License: GPLv2
URL: http://www.callweaver.org/
Source0: http://devs.callweaver.org/1.2_snapshots/callweaver-RC-1.1.99.%{snap}.tar.gz
-Patch0: callweaver-zap-build-fix.patch
-Patch1: callweaver-open-macro.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: spandsp-devel >= 0.0.4-0.1.pre4
@@ -173,8 +171,6 @@
%prep
%setup -q -n callweaver-RC-1.1.99.%{snap}
-#%patch0 -p1
-#%patch1 -p1
%build
%if 0%{?snap}
16Â years, 3Â months
rpms/callweaver/devel .cvsignore, 1.3, 1.4 callweaver.spec, 1.7, 1.8 sources, 1.3, 1.4 callweaver-open-macro.patch, 1.2, NONE callweaver-zap-build-fix.patch, 1.1, NONE
by fedora-extras-commitsï¼ redhat.com
Author: dwmw2
Update of /cvs/pkgs/rpms/callweaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32444
Modified Files:
.cvsignore callweaver.spec sources
Removed Files:
callweaver-open-macro.patch callweaver-zap-build-fix.patch
Log Message:
update to 20071230 RC5 snapshot
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/callweaver/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 22 Aug 2007 19:44:10 -0000 1.3
+++ .cvsignore 31 Dec 2007 13:33:53 -0000 1.4
@@ -1 +1 @@
-callweaver-RC-1.1.99.20070822.tar.gz
+callweaver-RC-1.1.99.20071230.tar.gz
Index: callweaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/callweaver/devel/callweaver.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- callweaver.spec 6 Dec 2007 15:38:11 -0000 1.7
+++ callweaver.spec 31 Dec 2007 13:33:53 -0000 1.8
@@ -1,4 +1,4 @@
-%define snap 2861
+%define snap 20071230
%bcond_without misdn
%bcond_without zaptel
@@ -7,13 +7,13 @@
Name: callweaver
Version: 1.2
-Release: 0.4.rc4.20070822%{?dist}
+Release: 0.4.rc5.%{snap}%{?dist}
Summary: The Truly Open Source PBX
Group: Applications/Internet
License: GPLv2
URL: http://www.callweaver.org/
-Source0: http://devs.callweaver.org/1.2_snapshots/callweaver-RC-1.1.99.20070822.ta...
+Source0: http://devs.callweaver.org/1.2_snapshots/callweaver-RC-1.1.99.%{snap}.tar.gz
Patch0: callweaver-zap-build-fix.patch
Patch1: callweaver-open-macro.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -172,9 +172,9 @@
%prep
-%setup -q -n callweaver-RC-1.1.99.20070822
-%patch0 -p1
-%patch1 -p1
+%setup -q -n callweaver-RC-1.1.99.%{snap}
+#%patch0 -p1
+#%patch1 -p1
%build
%if 0%{?snap}
@@ -375,8 +375,8 @@
%{_sbindir}/eogi*
%changelog
-* Thu Dec 06 2007 Release Engineering <rel-eng at fedoraproject dot org> - 1.2-4
- - Rebuild for deps
+* Mon Dec 31 2007 David Woodhouse <dwmw2(a)infradead.org> 1.2-0.4.rc5.20071230
+- Update, rebuild for deps
* Thu Aug 23 2007 David Woodhouse <dwmw2(a)infradead.org> 1.2-0.3.rc4.20070822
- Handle open() being a macro
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/callweaver/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 22 Aug 2007 19:44:10 -0000 1.3
+++ sources 31 Dec 2007 13:33:53 -0000 1.4
@@ -1 +1 @@
-55d15fcba6699ca660840e22345c9f25 callweaver-RC-1.1.99.20070822.tar.gz
+fd253b6866ce59c95717d1c16a36a459 callweaver-RC-1.1.99.20071230.tar.gz
--- callweaver-open-macro.patch DELETED ---
--- callweaver-zap-build-fix.patch DELETED ---
16Â years, 3Â months
rpms/dnsmasq/devel .cvsignore, 1.16, 1.17 dnsmasq.spec, 1.27, 1.28 sources, 1.16, 1.17
by fedora-extras-commitsï¼ redhat.com
Author: jima
Update of /cvs/pkgs/rpms/dnsmasq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25330
Modified Files:
.cvsignore dnsmasq.spec sources
Log Message:
* Mon Dec 31 2007 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.41-0.4.test26
- Bugfix/feature enhancement update
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 13 Dec 2007 13:16:32 -0000 1.16
+++ .cvsignore 31 Dec 2007 12:39:26 -0000 1.17
@@ -1 +1 @@
-dnsmasq-2.41test24.tar.gz
+dnsmasq-2.41test26.tar.gz
Index: dnsmasq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/devel/dnsmasq.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- dnsmasq.spec 13 Dec 2007 13:16:32 -0000 1.27
+++ dnsmasq.spec 31 Dec 2007 12:39:26 -0000 1.28
@@ -2,7 +2,7 @@
%define releasecandidate 0
%if 0%{testrelease}
%define extrapath test-releases/
- %define extraversion test24
+ %define extraversion test26
%endif
%if 0%{releasecandidate}
%define extrapath release-candidates/
@@ -11,7 +11,7 @@
Name: dnsmasq
Version: 2.41
-Release: 0.3.%{?extraversion}%{?dist}
+Release: 0.4.%{?extraversion}%{?dist}
Summary: A lightweight DHCP/caching DNS server
Group: System Environment/Daemons
@@ -109,6 +109,9 @@
%changelog
+* Mon Dec 31 2007 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.41-0.4.test26
+- Bugfix/feature enhancement update
+
* Thu Dec 13 2007 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.41-0.3.test24
- Upstream fix for fairly serious regression
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 13 Dec 2007 13:16:32 -0000 1.16
+++ sources 31 Dec 2007 12:39:26 -0000 1.17
@@ -1 +1 @@
-8f81d4f231bf75617814d64fb972fd12 dnsmasq-2.41test24.tar.gz
+c22932e9685064fc5a7fd9bc8c8c8f93 dnsmasq-2.41test26.tar.gz
16Â years, 3Â months
rpms/audacious-plugins/devel .cvsignore, 1.12, 1.13 audacious-plugins.spec, 1.25, 1.26 sources, 1.12, 1.13
by fedora-extras-commitsï¼ redhat.com
Author: ertzing
Update of /cvs/extras/rpms/audacious-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24987
Modified Files:
.cvsignore audacious-plugins.spec sources
Log Message:
* Mon Dec 31 2007 Ralf Ertzinger <ralf(a)skytale.net> 1.4.3.2-1
- Update to 1.4.3.2
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audacious-plugins/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 30 Dec 2007 23:03:51 -0000 1.12
+++ .cvsignore 31 Dec 2007 12:09:28 -0000 1.13
@@ -1 +1 @@
-audacious-plugins-fedora-1.4.3.1.tar.gz
+audacious-plugins-fedora-1.4.3.2.tar.gz
Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- audacious-plugins.spec 30 Dec 2007 23:03:51 -0000 1.25
+++ audacious-plugins.spec 31 Dec 2007 12:09:28 -0000 1.26
@@ -1,7 +1,7 @@
%define aud_ver 1.4.0
Name: audacious-plugins
-Version: 1.4.3.1
+Version: 1.4.3.2
Release: 1%{?dist}
Summary: Plugins for the Audacious media player
@@ -241,6 +241,9 @@
%changelog
+* Mon Dec 31 2007 Ralf Ertzinger <ralf(a)skytale.net> 1.4.3.2-1
+- Update to 1.4.3.2
+
* Sun Dec 29 2007 Ralf Ertzinger <ralf(a)skytale.net> 1.4.3.1-1
- Update to 1.4.3.1
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audacious-plugins/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 30 Dec 2007 23:03:51 -0000 1.12
+++ sources 31 Dec 2007 12:09:28 -0000 1.13
@@ -1 +1 @@
-5970115675d87d41ec9c04725e9773f7 audacious-plugins-fedora-1.4.3.1.tar.gz
+d51b9554f8b97822f45fa773c5852e9c audacious-plugins-fedora-1.4.3.2.tar.gz
16Â years, 3Â months
rpms/freenx/devel freenx-0.7.1-sharing_and_multimedia_fixes.patch, NONE, 1.1 freenx.spec, 1.11, 1.12
by fedora-extras-commitsï¼ redhat.com
Author: athimm
Update of /cvs/extras/rpms/freenx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17643
Modified Files:
freenx.spec
Added Files:
freenx-0.7.1-sharing_and_multimedia_fixes.patch
Log Message:
Addresses or fixes bugs 216802, 235592, 250343.
freenx-0.7.1-sharing_and_multimedia_fixes.patch:
--- NEW FILE freenx-0.7.1-sharing_and_multimedia_fixes.patch ---
diff -rud freenx-0.7.1/nxloadconfig freenx-0.7.1.sharing_multimedia/nxloadconfig
--- freenx-0.7.1/nxloadconfig 2007-10-15 00:25:14.000000000 +0200
+++ freenx-0.7.1.sharing_multimedia/nxloadconfig 2007-12-31 11:46:12.000000000 +0100
@@ -101,11 +101,28 @@
# Restriction directives
-DISPLAY_BASE=1000
+#JJK: DISPLAY_BASE=1000
+#JJK: Change DISPLAY_BASE to 2000 to avoid conflict of DISPLAY_BASE+7000 with nasd
+DISPLAY_BASE=2000
SESSION_LIMIT=200
SESSION_USER_LIMIT="" #Calculated
DISPLAY_LIMIT=200
+#JJK: Added the following to allow printing when using cifs mount
+#JJK: Note the smb print port (#139) must then be tunnelled manually
+#JJK: from <DISPLAY+3000+SMBPORT_OFFSET> on the server to port 139 on the host
+#JJK: by running on the client:
+#JJK: ssh ... -R <DISPLAY+3000+SMBPORT_OFFSET>:<client name>:139
+#JJK: If SAMBA_MOUNT_SHARE_PROTOCOL="smbfs" (technically, if it doesn't equal
+#JJK 'cifs' or in most cases 'both') then the ssh tunnel is automatically
+#JJK: set up from port <DISPLAY+3000> on the server to port 139
+#JJK: on the remote client.
+#JJK: Note in *all* cases, the cups printer on the client is accessed from
+#JJK: the server via the command line, using the following -h flag:
+#JJK: -h localhost:<DISPLAY+9000> [-P <printer name>]
+#JJK: or via the CUPS web browser using:
+#JJK: http://localhost:<DISPLAY+9000>
+SMBPORT_OFFSET=8000
ENABLE_PERSISTENT_SESSION="all"
DISABLE_PERSISTENT_SESSION=""
@@ -154,7 +171,11 @@
ENABLE_CUPS_SEAMLESS="0"
CUPS_SEAMLESS_DELAY="10"
ENABLE_FOOMATIC="1"
-COMMAND_FOOMATIC="/usr/lib/cups/driver/foomatic-ppdfile"
+#JJK: COMMAND_FOOMATIC="/usr/lib/cups/driver/foomatic-ppdfile"
+COMMAND_FOOMATIC="/usr/bin/foomatic-ppdfile"
+
+#JJK: added the following path referenced in nxprint
+PPD_DIR="/usr/share/cups/model" #JJK: Note /usr/share/ppd on some systems
CUPS_BACKEND="/usr/lib/cups/backend"
CUPS_IPP_BACKEND="$CUPS_BACKEND/nxipp"
@@ -171,7 +192,8 @@
DEFAULT_X_WM=""
KILL_DEFAULT_X_WM="1"
USER_X_STARTUP_SCRIPT=.Xclients
-DEFAULT_X_SESSION=/etc/X11/xdm/Xsession
+#JJK: DEFAULT_X_SESSION=/etc/X11/xdm/Xsession
+DEFAULT_X_SESSION=/etc/X11/xinit/Xsession
COMMAND_START_KDE=startkde
COMMAND_START_GNOME=gnome-session
COMMAND_START_CDE=cdwm
Only in freenx-0.7.1: nxloadconfig.rej
diff -rud freenx-0.7.1/nxnode freenx-0.7.1.sharing_multimedia/nxnode
--- freenx-0.7.1/nxnode 2007-10-15 00:25:14.000000000 +0200
+++ freenx-0.7.1.sharing_multimedia/nxnode 2007-12-31 11:46:12.000000000 +0100
@@ -20,6 +20,20 @@
# Read the config file
. $(PATH=$(cd $(dirname $0) && pwd):$PATH which nxloadconfig) --userconf
+#JJK: Added following 'if' stanza as a kluge since the following variables
+#JJK: need to be set in cmd_node_smbmount node_umount_smb
+#JJK: but they are currently set only in startsession which is called
+#JJK: separately from nxserver via ssh so environment variables
+#JJK: aren't preserved.
+if [[ "$SAMBA_MOUNT_SHARE_PROTOCOL" = "cifs" || \
+ ( "$SAMBA_MOUNT_SHARE_PROTOCOL" = "both" && \
+ `which "$COMMAND_SMBMOUNT_CIFS"` && `which "$COMMAND_SMBUMOUNT_CIFS"` ) \
+ ]] > /dev/null 2>&1; then
+ COMMAND_SMBMOUNT=$COMMAND_SMBMOUNT_CIFS
+ COMMAND_SMBUMOUNT=$COMMAND_SMBUMOUNT_CIFS
+ SAMBA_MOUNT_SHARE_PROTOCOL="cifs"
+fi
+
#
# -----------------------------------------------------------------------------
# Startup of nxnode
@@ -593,11 +607,27 @@
touch "$USER_FAKE_HOME/.nx/C-$sess_id/pids/cupsd"
mkdir -p "$USER_FAKE_HOME/.nx/C-$sess_id/cups/spool/tmp" "$USER_FAKE_HOME/.nx/C-$sess_id/cups/spool/certs" "$USER_FAKE_HOME/.nx/C-$sess_id/cups/ppd" "$USER_FAKE_HOME/.nx/C-$sess_id/cups/cache"
+ mkdir -p "$USER_FAKE_HOME/.nx/C-$sess_id/cups/log" #JJK cups log file home
+
+#JJK: Modifications to cupsd.conf
+#JJK: - Added SystemGroup line in order to add $USER to SystemGroup
+#JJK: - Moved all the log files to log/<log>
+#JJK: - Set AccessLog to: log/access_log (was /dev/null)
+#JJK: - Added listening on $NODE_CUPSD_PORT
+#JJK: Listen localhost: $NODE_CUPSD_PORT
+#JJK: - Removed following line because directive is specific to Debian
+#JJK: PidFile $USER_FAKE_HOME/.nx/C-$sess_id/pids/cupsd
+#JJK: - Access restrictions borrowed from /etc/cups/cupsd.conf
+#JJK: - Default policy borrowed from /etc/cups/cupsd.conf but modified
+#JJK: to allow Add, Delete, and Default printer without (password)
+#JJK: authentication
+#JJK: - Note for more detailed logging set: LogLevel debug
cat <<EOF > $USER_FAKE_HOME/.nx/C-$sess_id/cups/cupsd.conf
-AccessLog /dev/null
-ErrorLog error_log
-PageLog page_log
+SystemGroup sys root $USER
+AccessLog log/access_log
+ErrorLog log/error_log
+PageLog log/page_log
LogLevel info
TempDir $USER_FAKE_HOME/.nx/C-$sess_id/cups/spool/tmp
RequestRoot $USER_FAKE_HOME/.nx/C-$sess_id/cups/spool
@@ -605,19 +635,60 @@
StateDir $USER_FAKE_HOME/.nx/C-$sess_id/cups/
CacheDir $USER_FAKE_HOME/.nx/C-$sess_id/cups/cache
+Listen localhost:$NODE_CUPSD_PORT
Listen $NODE_CUPSD_SOCKET
Browsing Off
ServerName localhost
-PidFile $USER_FAKE_HOME/.nx/C-$sess_id/pids/cupsd
+#JJK: Restrict access to the server...
<Location />
Order Deny,Allow
Deny From All
Allow from 127.0.0.1
</Location>
+#JJK: Restrict access to the admin pages...
+<Location /admin>
+ Encryption Required
+ Order allow,deny
+ Allow localhost
+</Location>
+
+#JJK: Restrict access to configuration files...
+<Location /admin/conf>
+ AuthType Basic
+ Require user @SYSTEM
+ Order allow,deny
+ Allow localhost
+</Location>
+
# Allow everything for anonymous, because we are protected through UNIX socket
+#JJK: Since allowing access via $NODE_CUPSD_PORT, need to add protection
<Policy default>
+ #JJK: Job-related operations must be done by the owner or an adminstrator...
+ <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job CUPS-Move-Job>
+ Require user @OWNER @SYSTEM
+ Order deny,allow
+ </Limit>
+
+ #JJK:All administration operations require an adminstrator to authenticate...
+ <Limit Pause-Printer Resume-Printer Set-Printer-Attributes Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After CUPS-Add-Class CUPS-Delete-Class CUPS-Accept-Jobs CUPS-Reject-Jobs>
+ AuthType Basic
+ Require user @SYSTEM
+ Order deny,allow
+ </Limit>
+
+ #JJK: Except need to allow these for nxnode to work
+ <Limit CUPS-Add-Printer CUPS-Delete-Printer CUPS-Set-Default>
+ Order deny,allow
+ </Limit>
+
+ # Only the owner or an administrator can cancel or authenticate a job...
+ <Limit Cancel-Job CUPS-Authenticate-Job>
+ Require user @OWNER @SYSTEM
+ Order deny,allow
+ </Limit>
+
<Limit All>
AuthType None
Order deny,allow
@@ -629,9 +700,17 @@
# copy mime.* files
cp -af "$CUPS_ETC"/mime.* "$USER_FAKE_HOME/.nx/C-$sess_id/cups/"
+ #JJK: Also copy over pstoraster.convs
+ cp -af "$CUPS_ETC"/mime.* "$CUPS_ETC"/pstoraster.convs "$USER_FAKE_HOME/.nx/C-$sess_id/cups/"
# start cupsd
- $COMMAND_CUPSD -c "$USER_FAKE_HOME/.nx/C-$sess_id/cups/cupsd.conf" &>/dev/null </dev/null
+#JJK: Note the directive PidFile in the original cupsd.conf intended for
+#JJK: recording the pid is a Debianism. Instead, we will use the non-daemon
+#JJK: form of cupsd and capture the pid directly
+#JJK: $COMMAND_CUPSD -c "$USER_FAKE_HOME/.nx/C-$sess_id/cups/cupsd.conf" &>/dev/null </dev/null
+ $COMMAND_CUPSD -F -c "$USER_FAKE_HOME/.nx/C-$sess_id/cups/cupsd.conf" &>/dev/null </dev/null &
+ NODE_CUPSD_PID=$!
+ echo $NODE_CUPSD_PID >"$USER_FAKE_HOME/.nx/C-$sess_id/pids/cupsd"
# setup KDE
if [ "$ENABLE_KDE_CUPS" = "1" -a -e "$KDE_PRINTRC" ]
@@ -673,6 +752,7 @@
cat "$USER_FAKE_HOME/.nx/C-$sess_id/scripts/mpoint" | while read mpoint
do
$COMMAND_SMBUMOUNT "$mpoint" >/dev/null 2>/dev/null
+ rmdir "$mpoint" >/dev/null 2>/dev/null #JJK:Remove mount point if empty
done
}
@@ -1084,6 +1164,7 @@
COMMAND_SMBMOUNT=/bin/true
COMMAND_SMBUMOUNT=/bin/true
+ smbport=139 #JJK: still may want to do printer sharing...
else # smbfs
smbport=139
fi
@@ -1303,7 +1384,8 @@
password=$(getparam password)
share=$(getparam share)
computername=$(getparam computername)
- dir=$(getparam dir | sed 's|$(SHARES)|MyShares|g')
+#JJK: dir=$(getparam dir | sed 's|$(SHARES)|MyShares|g')
+ dir=$(getparam dir | sed 's/\(%24\|\$\)(SHARES)/MyShares/g')
# rdir=$(getparam dir | sed 's|$(SHARES)/||g')
display=$(cd $USER_FAKE_HOME/.nx/; echo C-$SERVER_NAME-*-$sessionid | awk 'BEGIN {FS="-"} {i=NF-1; print $i}')
mkdir -p "$HOME/$dir"
@@ -1322,6 +1404,7 @@
echo "$HOME/$dir" >> "$USER_FAKE_HOME/.nx/C-$SERVER_NAME-$display-$sessionid/scripts/mpoint"
else
$PATH_BIN/nxdialog -dialog ok -caption "NXServer Message" -message "Info: Share: '//$computername/$share' failed to mount: $error" -display :$display &
+ rmdir "$HOME/$dir" >/dev/null 2>/dev/null #JJK: Remove mount point if empty
fi
}
@@ -1344,6 +1427,12 @@
# this will also setup the userspace cupsd
export CUPS_SERVER=$(node_cupsd_get_socket)
+#JJK: The following if-stanza kludge added to enable printing when smbport=cifs
+#JJK: since smb printing won't work when forwarded over port 445
+ if [ "$SAMBA_MOUNT_SHARE_PROTOCOL" = "cifs" ] ; then
+ let port=$port+$SMBPORT_OFFSET
+ fi
+
if [ "$type" = "smb" ]
then
DEVICE_URI="smb://$username:$password@127.0.0.1:$port/$share"
@@ -1357,6 +1446,9 @@
if [ "$ENABLE_CUPS_SEAMLESS" != "1" ]
then
+ #JJK: Export the following variables for use by nxdialog/nxprint
+ #JJK: Note they are also exported in nxdialog but doesn't help there
+ export ENABLE_FOOMATIC COMMAND_FOOMATIC PPD_DIR
MODEL=$($PATH_BIN/nxdialog -printer "$NAME" -display :$display)
[ -z "$MODEL" -o "$MODEL" = "cancel: aborted" ] && return
else
@@ -1364,7 +1456,11 @@
MODEL="download_cached"
fi
- PUBLIC="-u allow:$USER"
+#JJK: I like to also allow 'guest' so you can do things like print
+#JJK: testpages from the CUPS web interface. Note this is required
+#JJK: even for the original user to print test pages
+#JJK: PUBLIC="-u allow:$USER"
+ PUBLIC="-u allow:$USER,guest"
[ "$public" == "1" ] && PUBLIC=""
if [ "$MODEL" = "download_new" -o "$MODEL" = "download_cached" ]
Only in freenx-0.7.1: nxnode.rej
diff -rud freenx-0.7.1/nxprint freenx-0.7.1.sharing_multimedia/nxprint
--- freenx-0.7.1/nxprint 2007-10-15 00:25:14.000000000 +0200
+++ freenx-0.7.1.sharing_multimedia/nxprint 2007-12-31 11:46:12.000000000 +0100
@@ -51,7 +51,8 @@
if [ -z "$(find $UTILITY_DRIVERS_CACHE.all -mmin -60 2> /dev/null)" ]
then
{
- cd /usr/share/ppd/
+#JJK: cd /usr/share/ppd/
+ cd $PPD_DIR
awk -F '"' '/\*Manufacturer:/ { a[FILENAME]=$2 }
/\*NickName:/ { b[FILENAME]=$2 }
END {
Only in freenx-0.7.1: nxprint.rej
Index: freenx.spec
===================================================================
RCS file: /cvs/extras/rpms/freenx/devel/freenx.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- freenx.spec 10 Dec 2007 16:23:21 -0000 1.11
+++ freenx.spec 31 Dec 2007 11:12:16 -0000 1.12
@@ -5,14 +5,17 @@
Summary: Free Software (GPL) Implementation of the NX Server
Name: freenx
Version: 0.7.1
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2
Group: Applications/Internet
URL: http://freenx.berlios.de/
Source0: http://download.berlios.de/freenx/%{name}-%{version}.tar.gz
Source1: freenx.logrotate
+Patch0: freenx-0.7.1-sharing_and_multimedia_fixes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: openssh-server nc expect nx xorg-x11-server-Xorg xorg-x11-apps perl
+Requires: nx
+Requires: openssh-server nc expect which perl
+Requires: xorg-x11-server-Xorg xorg-x11-apps
%description
NX is an exciting new technology for remote display. It provides near
@@ -22,6 +25,7 @@
%prep
%setup -q
+%patch0 -p1 -b .sharing_and_multimedia
sed -i -e's,\$NX_DIR/bin,%{_pkglibexecdir},g'\
-e's,\$NX_DIR/lib,%{_pkglibdir},g'\
@@ -80,7 +84,9 @@
fi
echo -n "127.0.0.1 " > /var/lib/nxserver/home/.ssh/known_hosts
-cat /etc/ssh/ssh_host_rsa_key.pub >> /var/lib/nxserver/home/.ssh/known_hosts
+# We do depend on openssh-server, but package installation != key
+# creation time. See also Fedora bug #235592
+cat /etc/ssh/ssh_host_rsa_key.pub >> /var/lib/nxserver/home/.ssh/known_hosts 2>/dev/null
chown nx:root /var/lib/nxserver/home/.ssh/known_hosts
%files
@@ -95,6 +101,13 @@
%config(noreplace) %{_sysconfdir}/logrotate.d/freenx
%changelog
+* Mon Dec 31 2007 Axel Thimm <Axel.Thimm(a)ATrpms.net> - 0.7.1-4
+- Apply Jeffrey J. Kosowsky's patches to enable multimedia and
+ file/print sharing support (Fedora bug #216802).
+- Silence %%post output, when openssh's server has never been started
+ before (Fedora bug #235592).
+- Add dependency on which (Fedora bug #250343).
+
* Mon Dec 10 2007 Jon Ciesla <limb(a)jcomserv.net> - 0.7.1-3
- Fix syntax error in logrotate file, BZ 418221.
16Â years, 3Â months
rpms/cernlib-g77/EL-5 cernlib-g77.spec,1.1,1.2
by fedora-extras-commitsï¼ redhat.com
Author: pertusus
Update of /cvs/extras/rpms/cernlib-g77/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10332
Modified Files:
cernlib-g77.spec
Log Message:
* Mon Dec 31 2007 Patrice Dumas <pertusus at free.fr> 2006-21
- no --build-id for EL-5
Index: cernlib-g77.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/EL-5/cernlib-g77.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-g77.spec 31 Dec 2007 00:37:10 -0000 1.1
+++ cernlib-g77.spec 31 Dec 2007 10:13:40 -0000 1.2
@@ -35,6 +35,14 @@
%define compiler_string -g77
%if ! 0%{?g77_cernlib_compiler}
%define compiler -g77
+
+# there is no --build-id in RHEL 5.
+%if 0%{?rhel}
+%if "%rhel" <= "5"
+%define no_build_id 1
+%endif
+%endif
+
%endif
# no compat prefix, the utilities compiled with gfortran are non functionnal
# see Bug 241416
@@ -47,7 +55,7 @@
Name: %{?compat}cernlib%{?compiler}
Version: 2006
-Release: 20%{?dist}
+Release: 21%{?dist}
Summary: General purpose CERN library
Group: Development/Libraries
# As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -75,7 +83,7 @@
%endif
# indirectly requires lesstif or openmotif and X libs
-BuildRequires: xbae-devel
+BuildRequires: xbae-devel
# for patchy build scripts
BuildRequires: tcsh
@@ -110,7 +118,7 @@
Source203: patchy-unpack-rceta
# Shell scripts that go in /etc/profile.d
-# Currently they are not installed since tey do more harm than good, when
+# Currently they are not installed since they do more harm than good, when
# parallel cernlib versions are installed.
Source100: cernlib.sh.in
Source105: cernlib.csh.in
@@ -127,7 +135,7 @@
Source200: cernlib-remove-deadpool
Source201: cernlib-deadpool.txt
# copyright.in from the non split debian patchset
-Source203: cernlib-debian-copyright.in
+Source204: cernlib-debian-copyright.in
# debian patchsets
Patch100001: http://ftp.debian.org/debian/pool/main/c/cernlib/cernlib_2006.dfsg.2-2.di...
@@ -341,7 +349,7 @@
scripts from the utils subpackage.
%package devel
-Summary: General purpose CERN library development package
+Summary: General purpose CERN library development package
%if 0%{?old_lapack_name}
Requires: lapack blas
@@ -560,13 +568,9 @@
%patch -P 3 -p1
%patch -P 100 -p1
%patch -P 101 -p1
-# miscompilation and ICE with optimized code should be fixed with gfortran
-# there is still some code with -O0 from upstream, they are kept as-is
-%if ! %{with gfortran}
%patch -P 10201 -p1
%patch -P 10202 -p1
%patch -P 10203 -p1
-%endif
%patch -P 103 -p1
%patch -P 104 -p1
%patch -P 10501 -p1
@@ -874,7 +878,11 @@
# optflags are different for g77, so we remove problematic flags
FC_OPTFLAGS=`echo "%optflags" | sed -e 's/-mtune=[^ ]\+//' -e 's/-fstack-protector//' -e 's/--param=ssp-buffer-size=[^ ]\+//'`
# this is needed (at least in F-8).
+%if 0%{?no_build_id}
+G_LDFLAGS=
+%else
G_LDFLAGS='-Wl,--build-id'
+%endif
FC_COMPILER=g77
%endif
@@ -1410,6 +1418,9 @@
%endif
%changelog
+* Mon Dec 31 2007 Patrice Dumas <pertusus at free.fr> 2006-21
+- no --build-id for EL-5
+
* Tue Oct 30 2007 Patrice Dumas <pertusus at free.fr> 2006-20
- don't use the same spec for epel4
- always ship the packages with compiler suffix. This is needed for
16Â years, 3Â months
rpms/glaxium/F-7 glaxium_0.5-glutInit.patch, NONE, 1.1 glaxium.spec, 1.1, 1.2
by fedora-extras-commitsï¼ redhat.com
Author: jwrdegoede
Update of /cvs/extras/rpms/glaxium/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3424
Modified Files:
glaxium.spec
Added Files:
glaxium_0.5-glutInit.patch
Log Message:
* Mon Dec 31 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.5-3
- Fix glaxium exiting when pressing space (bz 427048)
glaxium_0.5-glutInit.patch:
--- NEW FILE glaxium_0.5-glutInit.patch ---
diff -up glaxium_0.5/main.cpp~ glaxium_0.5/main.cpp
--- glaxium_0.5/main.cpp~ 2007-12-31 10:44:18.000000000 +0100
+++ glaxium_0.5/main.cpp 2007-12-31 10:44:18.000000000 +0100
@@ -143,7 +143,7 @@ int main( int argc, char *argv[] )
signal(SIGINT, exit);
signal(SIGTERM, exit);
*/
-// glutInit(&argc, argv);
+ glutInit(&argc, argv);
SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE,8);
Index: glaxium.spec
===================================================================
RCS file: /cvs/extras/rpms/glaxium/F-7/glaxium.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glaxium.spec 9 Oct 2007 17:40:37 -0000 1.1
+++ glaxium.spec 31 Dec 2007 09:53:28 -0000 1.2
@@ -1,6 +1,6 @@
Name: glaxium
Version: 0.5
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: An OpenGL space shooter
Group: Amusements/Games
License: GPLv2+
@@ -10,6 +10,7 @@
Source2: %{name}.png
Patch0: %{name}-0.5-fixes.patch
Patch1: %{name}_0.5-allow-running-when-dsp-busy.patch
+Patch2: %{name}_0.5-glutInit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL_mixer-devel freeglut-devel libpng-devel desktop-file-utils
Requires: hicolor-icon-theme opengl-games-utils
@@ -23,6 +24,7 @@
%setup -q -n %{name}_%{version}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
sed -i 's|/games/glaxium|/glaxium|g' configure* Makefile.in
sed -i 's/\r//g' CHANGES.txt LICENSE README.txt
@@ -77,6 +79,9 @@
%changelog
+* Mon Dec 31 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.5-3
+- Fix glaxium exiting when pressing space (bz 427048)
+
* Sat Oct 6 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.5-2
- Add patch from packman which allows running when sound is not available
- Minor .desktop file improvements
16Â years, 3Â months