[DRE-commits] r4955 - trunk/merb/debian

[Joshua Timberman]

Author: jtimberman-guest
Date: 2010-03-18 02:18:13 +0000 (Thu, 18 Mar 2010)
New Revision: 4955

Modified:
   trunk/merb/debian/changelog
   trunk/merb/debian/control
   trunk/merb/debian/rules
Log:
add libmerb-param-protection-ruby packages, dependency for chef

Modified: trunk/merb/debian/changelog
===================================================================
--- trunk/merb/debian/changelog	2010-03-17 16:40:17 UTC (rev 4954)
+++ trunk/merb/debian/changelog	2010-03-18 02:18:13 UTC (rev 4955)
@@ -1,3 +1,9 @@
+merb (1.0.12+dfsg-4) unstable; urgency=low
+
+  * Add merb-param-protection package.
+
+ -- Joshua Timberman <joshua at opscode.com>  Wed, 17 Mar 2010 19:38:55 -0600
+
 merb (1.0.12+dfsg-3) unstable; urgency=low
 
   [ Paul van Tilburg ]

Modified: trunk/merb/debian/control
===================================================================
--- trunk/merb/debian/control	2010-03-17 16:40:17 UTC (rev 4954)
+++ trunk/merb/debian/control	2010-03-18 02:18:13 UTC (rev 4955)
@@ -179,6 +179,34 @@
  .
  This package contains the merb-slices libraries for Ruby 1.8.
 
+Package: libmerb-param-protection-ruby
+Architecture: all
+Depends: ${misc:Depends}, libmerb-param-protection-ruby1.8
+Suggests: libmerb-ruby-doc
+Description: Merb plugin with controller methods to filter parameters
+ Controller methods provided by this package:
+  * params_protected - removes ONLY those parameters explicitly specified.
+  * params_accessible - removes everything except what is explictly specified.
+  * log_params_filtered - scrubbed at log time.
+ See the RDOC documentation and the package README for more information.
+ .
+ This package is a dependency package, which depends on the package
+ containing actual Ruby merb-param-protection libraries for the default 
+ Ruby version (currently 1.8).
+
+Package: libmerb-param-protection-ruby1.8
+Architecture: all
+Depends: ${misc:Depends}, libmerb-core-ruby1.8
+Suggests: libmerb-ruby-doc
+Description: Merb plugin with controller methods to filter parameters
+ Controller methods provided by this package:
+  * params_protected - removes ONLY those parameters explicitly specified.
+  * params_accessible - removes everything except what is explictly specified.
+  * log_params_filtered - scrubbed at log time.
+ See the RDOC documentation and the package README for more information.
+ .
+ This package contains the merb-param-protection libraries for Ruby 1.8.
+
 Package: libmerb-ruby-doc
 Section: doc
 Architecture: all

Modified: trunk/merb/debian/rules
===================================================================
--- trunk/merb/debian/rules	2010-03-17 16:40:17 UTC (rev 4954)
+++ trunk/merb/debian/rules	2010-03-18 02:18:13 UTC (rev 4955)
@@ -108,6 +108,22 @@
     mv merb-helpers/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build merb-helpers/$(DEB_RUBY_SETUP_CMD) ; \
   fi
 
+MERB_PARAM_PROTECTION_INSTALL_SETUP_CMD = \
+  if [ ! -L merb-param-protection/$(DEB_RUBY_SETUP_CMD) ] ; then \
+    if [ -f merb-param-protection/$(DEB_RUBY_SETUP_CMD) ] ; then \
+      mv merb-param-protection/$(DEB_RUBY_SETUP_CMD) merb-param-protection/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ;\
+    fi ; \
+    ln -s $(PACKAGED_RUBY_SETUP_CMD) merb-param-protection/$(DEB_RUBY_SETUP_CMD) ; \
+  fi
+
+MERB_PARAM_PROTECTION_REMOVE_SETUP_CMD = \
+  if [ -L merb-param-protection/$(DEB_RUBY_SETUP_CMD) ] ; then \
+    rm merb-param-protection/$(DEB_RUBY_SETUP_CMD) ; \
+  fi ; \
+  if [ -f merb-param-protection/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ] ; then \
+    mv merb-param-protection/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build merb-param-protection/$(DEB_RUBY_SETUP_CMD) ; \
+  fi
+
 install/merb-core::
 	dh_installchangelogs
 	dh_installdirs
@@ -152,8 +168,14 @@
 	(cd merb-helpers && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) setup)
 	(cd merb-helpers && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) install --prefix=../debian/libmerb-helpers-ruby1.8)
 
+install/libmerb-param-protection-ruby1.8::
+	$(MERB_PARAM_PROTECTION_INSTALL_SETUP_CMD)
+	(cd merb-param-protection && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) config $(DEB_RUBY_CONFIG_ARGS))
+	(cd merb-param-protection && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) setup)
+	(cd merb-param-protection && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) install --prefix=../debian/libmerb-param-protection-ruby1.8)
+
 install/libmerb-ruby-doc::
-	rdoc --all --inline-source --fileboxes --line-numbers --fmt=html -o debian/$(cdbs_curpkg)/usr/share/doc/libmerb-ruby-doc/rdoc merb-core/lib merb-haml/lib merb-helpers/lib merb-assets/lib merb-slices/lib
+	rdoc --all --inline-source --fileboxes --line-numbers --fmt=html -o debian/$(cdbs_curpkg)/usr/share/doc/libmerb-ruby-doc/rdoc merb-core/lib merb-haml/lib merb-helpers/lib merb-assets/lib merb-slices/lib merb-param-protection/lib
 
 clean::
 	$(DEB_RUBY_INSTALL_SETUP_CMD)
@@ -162,6 +184,7 @@
 	$(MERB_SLICES_INSTALL_SETUP_CMD)
 	$(MERB_ASSETS_INSTALL_SETUP_CMD)
 	$(MERB_HELPERS_INSTALL_SETUP_CMD)
+	$(MERB_PARAM_PROTECTION_INSTALL_SETUP_CMD)
 	/usr/bin/ruby $(DEB_RUBY_SETUP_CMD) distclean
 	$(DEB_RUBY_REMOVE_SETUP_CMD)
 	$(MERB_CORE_REMOVE_SETUP_CMD)
@@ -169,5 +192,6 @@
 	$(MERB_SLICES_REMOVE_SETUP_CMD)
 	$(MERB_ASSETS_REMOVE_SETUP_CMD)
 	$(MERB_HELPERS_REMOVE_SETUP_CMD)
+	$(MERB_PARAM_PROTECTION_REMOVE_SETUP_CMD)
 	rm -f $(DEB_SRCDIR)/.config
 	rm -f $(DEB_SRCDIR)/InstalledFiles