[DRE-commits] r5633 - in trunk/activeldap/debian: . patches

Marc Dequènes duck at alioth.debian.org
Wed Jun 23 00:51:54 UTC 2010 

Author: duck
Date: 2010-06-23 00:51:54 +0000 (Wed, 23 Jun 2010)
New Revision: 5633

Added:
   trunk/activeldap/debian/README.Debian
   trunk/activeldap/debian/patches/gem_sux
Removed:
   trunk/activeldap/debian/libactiveldap-ruby1.8.links
   trunk/activeldap/debian/patches/rails_load_path
Modified:
   trunk/activeldap/debian/changelog
   trunk/activeldap/debian/control
   trunk/activeldap/debian/control.in
   trunk/activeldap/debian/patches/bad_shebang
   trunk/activeldap/debian/patches/series
   trunk/activeldap/debian/rules
   trunk/activeldap/debian/watch
Log:
[evol] NUR and minor fixes

Added: trunk/activeldap/debian/README.Debian
===================================================================
--- trunk/activeldap/debian/README.Debian	                        (rev 0)
+++ trunk/activeldap/debian/README.Debian	2010-06-23 00:51:54 UTC (rev 5633)
@@ -0,0 +1,9 @@
+
+  The file '/usr/share/doc/libactiveldap-ruby-doc/examples/al-admin.tgz'
+  contains several occurences of the JS Prototype Library, which have
+  been replaced by symlinks in order to avoid shipping versions of the
+  software containing security problems. You just need to install the
+  libjs-prototype to have the example in a working condition.
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Thu, 03 Dec 2009 15:15:25 +0100
+

Modified: trunk/activeldap/debian/changelog
===================================================================
--- trunk/activeldap/debian/changelog	2010-06-23 00:21:08 UTC (rev 5632)
+++ trunk/activeldap/debian/changelog	2010-06-23 00:51:54 UTC (rev 5633)
@@ -1,5 +1,25 @@
+activeldap (1.2.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Adapted to the new rails packages (components are now properly
+    split, reducing dependencies).
+  * Removed 'rails_load_path' patch, now useless (rails now is in the
+    standard include path).
+  * Removed useless tla VCS files cleanup.
+  * Fixed security problem with two 'prototype.js' included in a code
+    example (CVE-2007-2383, CVE-2008-7720), by using a symlink to the
+    path in the libjs-prototype package (with a note in README.Debian)
+    (Closes: #555263).
+  * In 'debian/rules', now use CDBS DEB_RUBY_LIBDIR variable instead of
+    hardcoded RUBY_ARCHALLDIR.
+  * Removed silly symlink 'README.activeldap' (Closes: #549667).
+  * Added a new patch to deactivate silly gem calls.
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Wed, 23 Jun 2010 02:20:03 +0200
+
 activeldap (1.0.9-2) unstable; urgency=high
 
+  [ Deepak Tripathi ]
   * debian/control
     + removed rdoc. (Closes: #581333)
     + added myself to uploaders.

Modified: trunk/activeldap/debian/control
===================================================================
--- trunk/activeldap/debian/control	2010-06-23 00:21:08 UTC (rev 5632)
+++ trunk/activeldap/debian/control	2010-06-23 00:51:54 UTC (rev 5633)
@@ -3,8 +3,9 @@
 Priority: optional
 Maintainer: Marc Dequènes (Duck) <Duck at DuckCorp.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, Deepak Tripathi <apenguinlinux at gmail.com>
-Build-Depends: debhelper (>= 7.0.1), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), ruby1.8, ruby-pkg-tools (>= 0.8)
-Build-Depends-Indep: graphviz
+Build-Depends: cdbs (>= 0.4.53),
+ debhelper (>= 7.0.1), ruby (>= 1.8.1), ruby-pkg-tools (>= 0.8)
+Build-Depends-Indep: rdoc (>= 1.8.1), graphviz
 Standards-Version: 3.8.4
 Homepage: http://rubyforge.org/projects/ruby-activeldap
 
@@ -19,13 +20,13 @@
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Suggests: doc-base
+Suggests: doc-base, libjs-prototype
 Description: an object-oriented interface to LDAP for Ruby
  This is the Rdoc-generated documentation for ActiveLDAP API.
 
 Package: libactiveldap-ruby1.8
 Architecture: all
-Depends: ${misc:Depends}, libruby1.8, libldap-ruby1.8 (>= 0.8.2), rails, libgettext-ruby1.8
+Depends: ${misc:Depends}, libruby1.8, libldap-ruby1.8 (>= 0.8.2), libactivesupport-ruby1.8 (>= 2.3.5), libactiverecord-ruby1.8 (>= 2.3.5), liblocale-ruby1.8 (>= 2.0.5), libgettext-activerecord-ruby1.8 (>= 2.1.0)
 Suggests: liblog4r-ruby1.8 (>= 1.0.4)
 Description: an object-oriented interface to LDAP for Ruby
  ActiveLDAP is a wrapper around Ruby/LDAP with its interface inspired

Modified: trunk/activeldap/debian/control.in
===================================================================
--- trunk/activeldap/debian/control.in	2010-06-23 00:21:08 UTC (rev 5632)
+++ trunk/activeldap/debian/control.in	2010-06-23 00:51:54 UTC (rev 5633)
@@ -2,9 +2,9 @@
 Section: ruby
 Priority: optional
 Maintainer: Marc Dequènes (Duck) <Duck at DuckCorp.org>
-Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Build-Depends: @cdbs@, ruby1.8, ruby-pkg-tools (>= 0.8)
-Build-Depends-Indep: graphviz
+Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, Deepak Tripathi <apenguinlinux at gmail.com>
+Build-Depends: @cdbs@, ruby (>= 1.8.1), ruby-pkg-tools (>= 0.8)
+Build-Depends-Indep: rdoc (>= 1.8.1), graphviz
 Standards-Version: 3.8.4
 Homepage: http://rubyforge.org/projects/ruby-activeldap
 
@@ -19,13 +19,13 @@
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Suggests: doc-base
+Suggests: doc-base, libjs-prototype
 Description: an object-oriented interface to LDAP for Ruby
  This is the Rdoc-generated documentation for ActiveLDAP API.
 
 Package: libactiveldap-ruby1.8
 Architecture: all
-Depends: ${misc:Depends}, libruby1.8, libldap-ruby1.8 (>= 0.8.2), rails (>= 2.3.2), libgettext-ruby1.8
+Depends: ${misc:Depends}, libruby1.8, libldap-ruby1.8 (>= 0.8.2), libactivesupport-ruby1.8 (>= 2.3.5), libactiverecord-ruby1.8 (>= 2.3.5), liblocale-ruby1.8 (>= 2.0.5), libgettext-activerecord-ruby1.8 (>= 2.1.0)
 Suggests: liblog4r-ruby1.8 (>= 1.0.4)
 Description: an object-oriented interface to LDAP for Ruby
  ActiveLDAP is a wrapper around Ruby/LDAP with its interface inspired

Deleted: trunk/activeldap/debian/libactiveldap-ruby1.8.links
===================================================================
--- trunk/activeldap/debian/libactiveldap-ruby1.8.links	2010-06-23 00:21:08 UTC (rev 5632)
+++ trunk/activeldap/debian/libactiveldap-ruby1.8.links	2010-06-23 00:51:54 UTC (rev 5633)
@@ -1 +0,0 @@
-/usr/share/rails/actionmailer/README /usr/share/doc/rails/README.activeldap

Modified: trunk/activeldap/debian/patches/bad_shebang
===================================================================
--- trunk/activeldap/debian/patches/bad_shebang	2010-06-23 00:21:08 UTC (rev 5632)
+++ trunk/activeldap/debian/patches/bad_shebang	2010-06-23 00:51:54 UTC (rev 5633)
@@ -1,10 +1,10 @@
-Index: activeldap-1.0.9/lib/active_ldap.rb
+Index: activeldap-1.2.1/lib/active_ldap.rb
 ===================================================================
---- activeldap-1.0.9.orig/lib/active_ldap.rb	2009-06-04 03:45:01.000000000 +0200
-+++ activeldap-1.0.9/lib/active_ldap.rb	2009-06-24 22:46:52.000000000 +0200
+--- activeldap-1.2.1.orig/lib/active_ldap.rb	2010-06-23 00:38:15.000000000 +0200
++++ activeldap-1.2.1/lib/active_ldap.rb	2010-06-23 00:50:43.000000000 +0200
 @@ -1,4 +1,4 @@
 -#!/usr/bin/ruby
 +#
  # = ActiveLdap
  #
- # "ActiveLdap" Copyright (C) 2004,2005 Will Drewry mailto:will at alum.bu.edu
+ #   Copyright (C) 2004,2005 Will Drewry mailto:will at alum.bu.edu

Added: trunk/activeldap/debian/patches/gem_sux
===================================================================
--- trunk/activeldap/debian/patches/gem_sux	                        (rev 0)
+++ trunk/activeldap/debian/patches/gem_sux	2010-06-23 00:51:54 UTC (rev 5633)
@@ -0,0 +1,17 @@
+Index: activeldap-1.2.1/lib/active_ldap.rb
+===================================================================
+--- activeldap-1.2.1.orig/lib/active_ldap.rb	2010-06-23 02:11:08.000000000 +0200
++++ activeldap-1.2.1/lib/active_ldap.rb	2010-06-23 02:11:42.000000000 +0200
+@@ -890,9 +890,9 @@
+ require_gem_if_need = Proc.new do |library_name, gem_name, *gem_args|
+   gem_name ||= library_name
+   begin
+-    if !gem_args.empty? and Object.const_defined?(:Gem)
+-      gem gem_name, *gem_args
+-    end
++    #if !gem_args.empty? and Object.const_defined?(:Gem)
++    #  gem gem_name, *gem_args
++    #end
+     require library_name
+   rescue LoadError
+     require 'rubygems'

Deleted: trunk/activeldap/debian/patches/rails_load_path
===================================================================
--- trunk/activeldap/debian/patches/rails_load_path	2010-06-23 00:21:08 UTC (rev 5632)
+++ trunk/activeldap/debian/patches/rails_load_path	2010-06-23 00:51:54 UTC (rev 5633)
@@ -1,19 +0,0 @@
-Index: activeldap-1.0.9/lib/active_ldap.rb
-===================================================================
---- activeldap-1.0.9.orig/lib/active_ldap.rb	2009-06-24 22:46:52.000000000 +0200
-+++ activeldap-1.0.9/lib/active_ldap.rb	2009-06-24 22:47:03.000000000 +0200
-@@ -872,6 +872,14 @@
- # package, and I'd like to see it prove helpful to more people than just myself.
- #
- 
-+# add Rails load path for Debian, until rails framework is split properly
-+DEB_RAILS_PATH = "/usr/share/rails"
-+Dir.new(DEB_RAILS_PATH).each do |file|
-+	next if file =~ /^\./
-+	path = File.join(DEB_RAILS_PATH, file, "lib")
-+	$: << path if File.directory?(path)
-+end
-+
- require_gem_if_need = Proc.new do |library_name, gem_name, *gem_args|
-   gem_name ||= library_name
-   begin

Modified: trunk/activeldap/debian/patches/series
===================================================================
--- trunk/activeldap/debian/patches/series	2010-06-23 00:21:08 UTC (rev 5632)
+++ trunk/activeldap/debian/patches/series	2010-06-23 00:51:54 UTC (rev 5633)
@@ -1,2 +1,2 @@
 bad_shebang
-rails_load_path
+gem_sux

Modified: trunk/activeldap/debian/rules
===================================================================
--- trunk/activeldap/debian/rules	2010-06-23 00:21:08 UTC (rev 5632)
+++ trunk/activeldap/debian/rules	2010-06-23 00:51:54 UTC (rev 5633)
@@ -3,20 +3,16 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/ruby-pkg-tools/1/class/ruby-common.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 
-RUBY_ARCHALLDIR=/usr/lib/ruby/1.8
-
 install/libactiveldap-ruby1.8::
-	mkdir -p debian/$(cdbs_curpkg)/$(RUBY_ARCHALLDIR)
-	cp -r lib/* debian/$(cdbs_curpkg)/$(RUBY_ARCHALLDIR)/
-	find debian/$(cdbs_curpkg)/$(RUBY_ARCHALLDIR)/ -type f -exec chmod a-x {} \;
+	mkdir -p debian/$(cdbs_curpkg)/$(DEB_RUBY_LIBDIR)
+	cp -r lib/* debian/$(cdbs_curpkg)/$(DEB_RUBY_LIBDIR)/
+	find debian/$(cdbs_curpkg)/$(DEB_RUBY_LIBDIR)/ -type f -exec chmod a-x {} \;
 
 binary-install/libactiveldap-ruby-doc::
-	tar -cz -C debian/$(cdbs_curpkg)/usr/share/doc/libactiveldap-ruby-doc/examples/ --remove-files \
-		-f debian/$(cdbs_curpkg)/usr/share/doc/libactiveldap-ruby-doc/examples/al-admin.tgz al-admin
+	find debian/$(cdbs_curpkg) -name "prototype.js" -delete -exec ln -s /usr/share/javascript/prototype/prototype.js {} \;
+	tar -cz -C debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/examples \
+		-f debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/examples/al-admin.tgz al-admin
+	rm -rf debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/examples/al-admin
 
-$(patsubst %,binary-predeb/%,$(DEB_PACKAGES)) ::
-	find debian/$(cdbs_curpkg) -depth -name ".arch-ids" -exec rm -rf {} \;
-

Modified: trunk/activeldap/debian/watch
===================================================================
--- trunk/activeldap/debian/watch	2010-06-23 00:21:08 UTC (rev 5632)
+++ trunk/activeldap/debian/watch	2010-06-23 00:51:54 UTC (rev 5633)
@@ -1,4 +1,4 @@
 version=3
 http://rubyforge.org/frs/?group_id=381 \
-	(?:.*/)?(?:ruby-)?activeldap-([0-9.]+).(?:tar\.gz|tgz) \
+	(?:.*/)?activeldap-([0-9.]+).(?:tar\.gz|tgz) \
         debian uupdate

More information about the Pkg-ruby-extras-commits mailing list