2009-11-17 Brian Cameron <
[email protected]>
* SUNWgnome-terminal.spec: Change /usr/lib/gnome-pty-helper to 755
permissions instead of 711. Since it is no longer setuid, this is
more appropriate.
* base-specs/vte.spec, patches/vte-01-passfd.diff: Add patch to revert
the pass_fd function to use the same code found in vte 0.17.4.
Without this fix, gnome-pty-helper does not work
--- a/ChangeLog Tue Nov 17 21:03:07 2009 +0000
+++ b/ChangeLog Wed Nov 18 01:27:42 2009 +0000
@@ -1,3 +1,12 @@
+2009-11-17 Brian Cameron <[email protected]>
+
+ * SUNWgnome-terminal.spec: Change /usr/lib/gnome-pty-helper to 755
+ permissions instead of 711. Since it is no longer setuid, this is
+ more appropriate.
+ * base-specs/vte.spec, patches/vte-01-passfd.diff: Add patch to revert
+ the pass_fd function to use the same code found in vte 0.17.4.
+ Without this fix, gnome-pty-helper does not work
+
2009-11-17 Brian Cameron <[email protected]>
* base-specs/gst.spec: Change configure option "--with-check=no" to
@@ -1590,7 +1599,7 @@
* manpages/Makefile
* manpages/man1/freetts-synthesis-driver.1
* manpages/man3/libfreettsdriver.so.3:
- Remove unused manpages of freetts dirver.
+ Remove unused manpages of freetts dirver.
2009-09-23 Alan Coopersmith <[email protected]>
@@ -1689,7 +1698,7 @@
* patches/sound-juicer-03*.diff
* patches/sound-juicer-04*.diff
- update patch to fix bug 11430, 11512
+ update patch to fix bug 11430, 11512
2009-09-23 Lin Ma <[email protected]>
@@ -2094,7 +2103,6 @@
2009-09-11 Wang Xin <[email protected]>
Remove SUNWmlib dependency because gtk2 uses dlopen to load it.
-
* SUNWevolution-data-server.spec:
* SUNWevolution-exchange.spec:
* SUNWevolution.spec:
@@ -2184,7 +2192,7 @@
2009-09-09 Stephen Browne <[email protected]>
* patches/gtk-whatever-trusted-extensions.diff: restrict url links in
- about dialogs. Fixes bugster 6880252.
+ about dialogs. Fixes bugster 6880252.
2009-09-09 Stephen Browne <[email protected]>
* patches/gnome-panel-10-trusted-extensions.diff: restrict new address
@@ -2486,10 +2494,9 @@
2009-09-03 Lin Ma <[email protected]>
* base-specs/gnome-settings-daemon.spec:
- * patches/gnome-settings-daemon-10-readd-gst-vol-control-support.di
- ff:
+ * patches/gnome-settings-daemon-10-readd-gst-vol-control-support.diff:
* patches/gnome-settings-daemon-11-dispswitch-keybinding.diff:
- Bump to 2.27.91 and update patches.
+ Bump to 2.27.91 and update patches.
2009-09-03 Wang Xin <[email protected]>
--- a/SUNWgnome-terminal.spec Tue Nov 17 21:03:07 2009 +0000
+++ b/SUNWgnome-terminal.spec Wed Nov 18 01:27:42 2009 +0000
@@ -131,7 +131,7 @@
%dir %attr (0755, root, bin) %{_libdir}
%{_libdir}/lib*.so*
%attr (-, root, bin) %{_libdir}/python*
-%attr (0711, root, bin) %{_libexecdir}/gnome-pty-helper
+%attr (0755, root, bin) %{_libexecdir}/gnome-pty-helper
%dir %attr (0755, root, sys) %{_datadir}
%dir %attr (0755, root, other) %{_datadir}/applications
%{_datadir}/applications/*
@@ -194,22 +194,26 @@
%{_sysconfdir}/gconf/schemas/gnome-terminal.schemas
%changelog
+* Tue Nov 17 2009 - [email protected]
+- Since gnome-pty-helper is not a set-uid program anymore, it makes more sense
+ for its permissions to be 755 than 711.
* Tue Jue 11 2009 - [email protected]
-- Headers of SUNWncurses changed from /usr/gnu/include to /usr/include/ncurses in doo 9267,change the CFLAG and RPM_OPT_FLAGS
+- Headers of SUNWncurses changed from /usr/gnu/include to /usr/include/ncurses
+ in doo 9267,change the CFLAG and RPM_OPT_FLAGS.
* Fri Apr 3 2009 - [email protected]
-- use desktop-cache instead of postrun
+- use desktop-cache instead of postrun.
* Wed Mar 18 2009 - [email protected]
-- Add BuildRequires: SUNWgtk-doc
+- Add BuildRequires: SUNWgtk-doc.
* Tue Jan 20 2009 - [email protected]
- Fix packaging after bumping gnome-terminal to 2.25.5.
* Sat Dec 27 2008 - [email protected]
- Add -I/usr/gnu/include in CFLAGS.
* Fri Dec 26 2008 - [email protected]
-- Remove /usr/sfw from CFLAGS and LDFLAGS since freetype2 is avail in /usr
-- Add Requires:SUNWncurses and BuildRequires:SUNWncurses-devel
+- Remove /usr/sfw from CFLAGS and LDFLAGS since freetype2 is avail in /usr.
+- Add Requires:SUNWncurses and BuildRequires:SUNWncurses-devel.
- Add "-L/usr/gnu/lib -R/usr/gnu/lib" to LDFLAGS since ncurses ship libraries
- under /usr/gnu/lib
-- Update %files because vte upgrading
+ under /usr/gnu/lib.
+- Update %files because vte upgrading.
* Wed Sep 24 2008 - [email protected]
- Take out doc po/ChangeLog from files as it's no longer there.
* Mon Sep 15 2008 - [email protected]
@@ -219,33 +223,33 @@
* Fri Mar 28 2008 - [email protected]
- Add SUNW_Copyright.
* Thu Jan 3 2008 - [email protected]
-- use gconf-install.script instead of an inline script
+- use gconf-install.script instead of an inline script.
* Tue Nov 06 2007 - [email protected]
-- Add -R/usr/sfw/lib to LDFLAGS (-L/usr/sfw/lib was already there)
+- Add -R/usr/sfw/lib to LDFLAGS (-L/usr/sfw/lib was already there).
* Fri Sep 28 2007 - [email protected]
-- delete Nevada X deps
-- delete some unneeded env vars
+- delete Nevada X deps.
+- delete some unneeded env vars.
* Sat Aug 18 2007 - [email protected]
- Comment out removal of /var dir as it is no longer installed.
* Tue Apr 24 2007 - [email protected]
-- s/0755/-/ in defattr so that files are not made all executable
+- s/0755/-/ in defattr so that files are not made all executable.
* Wed Jan 24 2007 - [email protected]
- Add to LDFLAGS to find libXrender.
* Mon Sep 04 2006 - [email protected]
-- New Manpage tarball
+- New Manpage tarball.
* Thu Jul 27 2006 - [email protected]
- Delete scrollkeeper files before packaging.
* Fri Jul 14 2006 - [email protected]
- update %post/%postun/etc scripts to support diskless client setup,
- part of 6448317
+ part of 6448317.
* Thu Jun 29 2006 - [email protected]
-- update postrun scripts
+- update postrun scripts.
* Sun Jun 11 2006 - [email protected]
-- change group from other to bin/sys
+- change group from other to bin/sys.
* Fri Jun 2 2006 - [email protected]
-- use post/preun scripts to install schemas into the merged gconf files
+- use post/preun scripts to install schemas into the merged gconf files.
* Wed May 10 2006 - [email protected]
-- merge -share pkg(s) into the base pkg(s)
+- merge -share pkg(s) into the base pkg(s).
* Tue Feb 21 2006 - [email protected]
- Add X packages to Requires after running check-deps.pl script.
* Mon Feb 20 2006 - [email protected]
@@ -253,31 +257,31 @@
* Wed Jan 18 2006 - [email protected]
- Remove application-registry from %files as it is no longer installed.
* Sat Dec 3 2005 - [email protected]
-- add %post script that runs update-desktop-database
+- add %post script that runs update-desktop-database.
* Wed Nov 30 2005 - [email protected]
- Add Build/Requires on SUNWPython/-devel and SUNWgnome-python-libs/-devel.
* Tue Nov 29 2005 - [email protected]
-- remove javahelp stuff
+- remove javahelp stuff.
* Tue Sep 20 2005 - [email protected]
-- update Python paths
+- update Python paths.
* Fri Sep 16 2005 - [email protected]
-- remove unpackaged files to add to %files
+- remove unpackaged files to add to %files.
* Thu Sep 01 2005 - [email protected]
- Add /usr/sfw/lib/pkgconfig to PKG_CONFIG_PATH so that pygtk2 can be found.
* Thu May 19 2005 - [email protected]
-- Update to 2.10
+- Update to 2.10.
* Fri Oct 15 2004 - [email protected]
- Remove SGID bit from gnome-pty-helper. Fixes bugtraq bug#5091209.
* Sat Oct 02 2004 - [email protected]
-- added %pkgbuild_postprocess
+- added %pkgbuild_postprocess.
* Thu Sep 09 2004 - [email protected]
-- Added libvte.3, vte.1 manpages
+- Added libvte.3, vte.1 manpages.
* Wed Aug 25 2004 - [email protected]
-- Updated files section to extract only l10n contents
+- Updated files section to extract only l10n contents.
* Mon Aug 23 2004 - [email protected]
-- Bug 5090964 : remove l10n entries from base package into -l10n package
+- Bug 5090964 : remove l10n entries from base package into -l10n package.
* Mon Aug 23 2004 - [email protected]
-- s/SUNWpl5u/SUNWperl584usr/
+- s/SUNWpl5u/SUNWperl584usr/.
* Wed Aug 18 2004 [email protected]
- Change manpage perms for Solaris integration.
* Thu Jul 08 2004 [email protected]
@@ -287,15 +291,15 @@
* Sat Jun 26 2004 [email protected]
- Changed install location to /usr/...
* Wed Jun 2 2004 - [email protected]
-- Added %{_datadir}/locale to install l10n messages
+- Added %{_datadir}/locale to install l10n messages.
* Wed Mar 24 2004 - [email protected]
-- Added SGML man page integration
+- Added SGML man page integration.
* Sat Mar 06 2004 - [email protected]
-- set LDFLAGS
+- set LDFLAGS.
* Sun Feb 29 2004 - [email protected]
- remove dependency on SUNWgnome-libs-share and SUNWgnome-libs-root, they
- are taken care by SUNWgnome-libs; fix gconf permissions
-- add -D__STDC_VERSION__=199409L instead of -xc99=none
+ are taken care by SUNWgnome-libs; fix gconf permissions.
+- add -D__STDC_VERSION__=199409L instead of -xc99=none.
* Mon Feb 23 2004 - <[email protected]>
- install gconf schemas at end of install stage.
- run rm -Rf during clean stage.
--- a/base-specs/vte.spec Tue Nov 17 21:03:07 2009 +0000
+++ b/base-specs/vte.spec Wed Nov 18 01:27:42 2009 +0000
@@ -19,6 +19,8 @@
Vendor: Sun Microsystems, Inc.
Summary: Terminal Emulation Widget Library
Source: http://download.gnome.org/sources/%{name}/0.22/%{name}-%{version}.tar.bz2
+# date:2009-11-17 owner:yippi type:bug bugzilla:575183
+Patch1: vte-01-passfd.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -45,6 +47,7 @@
%prep
%setup -q
+%patch1 -p1
%build
export PYTHON="/usr/bin/python%{default_python_version}"
@@ -72,7 +75,12 @@
--sysconfdir=%{_sysconfdir} \
--datadir=%{_datadir} \
--libexecdir=%{_libexecdir} \
- %{gtk_doc_option}
+ %{gtk_doc_option} \
+%if %debug_build
+ --enable-debug=yes \
+%else
+ --enable-debug=no \
+%endif
cp -rp python python2.4
@@ -83,7 +91,12 @@
--sysconfdir=%{_sysconfdir} \
--datadir=%{_datadir} \
--libexecdir=%{_libexecdir} \
- %{gtk_doc_option}
+ %{gtk_doc_option} \
+%if %debug_build
+ --enable-debug=yes \
+%else
+ --enable-debug=no \
+%endif
make -j $CPUS \
pyexecdir=%{_libdir}/python%{default_python_version}/vendor-packages \
@@ -141,6 +154,10 @@
%{_libdir}/python%{default_python_version}/vendor-packages/gtk-2.0/vtemodule.so
%changelog
+* Tue Nov 17 2009 - [email protected]
+- Add patch vte-01-passfd.diff to revert the pass_fd function to use the same
+ code found in vte 0.17.4. Without this fix, gnome-pty-helper does not work
+ if you build VTE with debug.
* Wed Nov 04 2009 - [email protected]
- Bump to 0.22.3.
* Wed Oct 14 2009 - [email protected]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/vte-01-passfd.diff Wed Nov 18 01:27:42 2009 +0000
@@ -0,0 +1,69 @@
+--- vte-0.22.3/gnome-pty-helper/gnome-pty-helper.c-orig 2009-11-17 18:33:29.490627268 -0600
++++ vte-0.22.3/gnome-pty-helper/gnome-pty-helper.c 2009-11-17 19:07:03.664115242 -0600
+@@ -94,16 +94,20 @@ static pty_info *pty_list;
+ #endif
+ #endif /* CMSG_DATA */
+
+-/* Solaris doesn't define these */
+-#ifndef CMSG_ALIGN
+-#define CMSG_ALIGN(len) (((len) + sizeof (size_t) - 1) & (size_t) ~(sizeof (size_t) - 1))
+-#endif
+-#ifndef CMSG_SPACE
+-#define CMSG_SPACE(len) (CMSG_ALIGN (len) + CMSG_ALIGN (sizeof (struct cmsghdr)))
+-#endif
+-#ifndef CMSG_LEN
+-#define CMSG_LEN(len) (CMSG_ALIGN (sizeof (struct cmsghdr)) + (len))
+-#endif
++static struct cmsghdr *cmptr;
++static int CONTROLLEN;
++
++static int
++init_msg_pass (void)
++{
++ CONTROLLEN = (CMSG_DATA (cmptr) - (unsigned char *)cmptr) + sizeof(int);
++ cmptr = malloc (CONTROLLEN);
++
++ if (cmptr)
++ return 0;
++
++ return -1;
++}
+
+ static int
+ pass_fd (int client_fd, int fd)
+@@ -111,8 +115,6 @@ pass_fd (int client_fd, int fd)
+ struct iovec iov[1];
+ struct msghdr msg;
+ char buf [1];
+- char cmsgbuf[CMSG_SPACE(sizeof(int))];
+- struct cmsghdr *cmptr;
+
+ iov [0].iov_base = buf;
+ iov [0].iov_len = 1;
+@@ -121,13 +123,12 @@ pass_fd (int client_fd, int fd)
+ msg.msg_iovlen = 1;
+ msg.msg_name = NULL;
+ msg.msg_namelen = 0;
+- msg.msg_control = (caddr_t) cmsgbuf;
+- msg.msg_controllen = sizeof(cmsgbuf);
++ msg.msg_control = (caddr_t) cmptr;
++ msg.msg_controllen = CONTROLLEN;
+
+- cmptr = CMSG_FIRSTHDR(&msg);
+ cmptr->cmsg_level = SOL_SOCKET;
+ cmptr->cmsg_type = SCM_RIGHTS;
+- cmptr->cmsg_len = CMSG_LEN(sizeof(int));
++ cmptr->cmsg_len = CONTROLLEN;
+ *(int *)CMSG_DATA (cmptr) = fd;
+
+ if (sendmsg (client_fd, &msg, 0) != 1)
+@@ -681,6 +682,9 @@ main (int argc, char *argv [])
+ signal (SIGHUP, exit_handler);
+ signal (SIGTERM, exit_handler);
+
++ if (init_msg_pass () == -1)
++ exit (1);
++
+ while (!done) {
+ res = n_read (STDIN_FILENO, &op, sizeof (op));
+