Permalink
Browse files

RoR 3.2.13 and Redmine 2.3.0.

  • Loading branch information...
1 parent 930b1ed commit 0167620ec15bec1495f60ca1d45d72fa6f4601da @grayed grayed committed Mar 21, 2013
@@ -2,7 +2,7 @@
COMMENT = object relation model implementation for ruby
-VERSION = 3.2.12
+VERSION = 3.2.13
DISTNAME = activerecord-${VERSION}
CATEGORIES = databases
@@ -1,2 +1,2 @@
-SHA256 (activerecord-3.2.12.gem) = 0Wt0fX7YUui6P77dQXMWYEY0mWeM7JiOF8ezN7aPiDo=
-SIZE (activerecord-3.2.12.gem) = 291328
+SHA256 (activerecord-3.2.13.gem) = Be0HGLJSAubxkHwC8bxVxZlpYtekaSJyo/2ILbzMufw=
+SIZE (activerecord-3.2.13.gem) = 294400
@@ -2,7 +2,7 @@
COMMENT = eases web-request routing, handling, and response
-VERSION = 3.2.12
+VERSION = 3.2.13
DISTNAME = actionpack-${VERSION}
CATEGORIES = devel
@@ -1,2 +1,2 @@
-SHA256 (actionpack-3.2.12.gem) = 8yoCfYcBSv9ATPwtrFxKEHfYGpgVzx4a3FofYBzV6KY=
-SIZE (actionpack-3.2.12.gem) = 287232
+SHA256 (actionpack-3.2.13.gem) = vHgkWaDqJi544QpH1h7B39NwcKIgdmRm9OATxfNoc9Q=
+SIZE (actionpack-3.2.13.gem) = 289280
@@ -2,7 +2,7 @@
COMMENT = toolkit for building modeling frameworks
-VERSION = 3.2.12
+VERSION = 3.2.13
DISTNAME = activemodel-${VERSION}
CATEGORIES = devel
@@ -12,9 +12,9 @@ PERMIT_PACKAGE_CDROM = Yes
MODULES = lang/ruby
BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = devel/ruby-i18n,${MODRUBY_FLAVOR}>=0.6,<1.0 \
- textproc/ruby-builder,${MODRUBY_FLAVOR}>=3.0.0,<3.1 \
- devel/ruby-activesupport,${MODRUBY_FLAVOR}=${VERSION}
+RUN_DEPENDS = devel/ruby-activesupport,${MODRUBY_FLAVOR}=${VERSION} \
+ devel/ruby-i18n,${MODRUBY_FLAVOR}>=0.6,<1.0 \
+ textproc/ruby-builder,${MODRUBY_FLAVOR}>=3.0.0,<3.1
CONFIGURE_STYLE = ruby gem
@@ -1,2 +1,2 @@
-SHA256 (activemodel-3.2.12.gem) = DtsVFGEvSXZ8CR5f6HP4SAYGdVrwHwQvzHn5Br2Yg/A=
-SIZE (activemodel-3.2.12.gem) = 44544
+SHA256 (activemodel-3.2.13.gem) = xcJpsCs9Oe6j1NjMEyMZgooaCo4GyFehMQ+AyqlP7FI=
+SIZE (activemodel-3.2.13.gem) = 45056
@@ -2,7 +2,7 @@
COMMENT = utility classes and extensions for rails framework
-DISTNAME = activesupport-3.2.12
+DISTNAME = activesupport-3.2.13
CATEGORIES = devel
# MIT License
@@ -1,2 +1,2 @@
-SHA256 (activesupport-3.2.12.gem) = T1P6VeCusA9AxnfCniPaI76iEE7fFgu986842fOdOL4=
-SIZE (activesupport-3.2.12.gem) = 287744
+SHA256 (activesupport-3.2.13.gem) = HjnKaYdmNKOONE3QedkrOrJ+G94Ll5sE0OMlJZGkUe0=
+SIZE (activesupport-3.2.13.gem) = 288768
@@ -2,7 +2,7 @@
COMMENT= easy email delivery and testing for ruby
-VERSION= 3.2.12
+VERSION= 3.2.13
DISTNAME= actionmailer-${VERSION}
CATEGORIES= mail
@@ -13,7 +13,7 @@ MODULES= lang/ruby
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= devel/ruby-actionpack,${MODRUBY_FLAVOR}=${VERSION} \
- mail/ruby-mail,${MODRUBY_FLAVOR}>=2.4.4,<2.5
+ mail/ruby-mail,${MODRUBY_FLAVOR}>=2.5.3,<2.6
CONFIGURE_STYLE=ruby gem
@@ -1,2 +1,2 @@
-SHA256 (actionmailer-3.2.12.gem) = h1Ebl7pdtWWe7s7mYY3Ts4JEmOE2rZfy2TGNcMv3TGY=
-SIZE (actionmailer-3.2.12.gem) = 22016
+SHA256 (actionmailer-3.2.13.gem) = Btg+NidZjPeeObXKzIxFBpNgm/yGPQwAMRSplcsKXE8=
+SIZE (actionmailer-3.2.13.gem) = 22016
View
@@ -3,7 +3,7 @@
COMMENT-main = bug tracker and project management system
COMMENT-extra = some sample files for Redmine
-V = 2.2.3
+V = 2.3.0
DISTNAME = redmine-${V}
PKGNAME-main = ${DISTNAME}
PKGNAME-extra = redmine-extra-${V}
@@ -13,9 +13,6 @@ MAINTAINER = Vadim Zhukov <persgray@gmail.com>
# GPLv3
PERMIT_PACKAGE_CDROM = Yes
-PERMIT_PACKAGE_FTP = Yes
-PERMIT_DISTFILES_CDROM =Yes
-PERMIT_DISTFILES_FTP = Yes
MASTER_SITES = http://files.rubyforge.vm.bytemark.co.uk/redmine/
@@ -41,7 +38,7 @@ RUN_DEPENDS-main = ${RUN_DEPENDS} \
textproc/ruby-builder,${MODRUBY_FLAVOR}>=3.0.0,<3.1 \
textproc/ruby-coderay,${MODRUBY_FLAVOR}>=1.0.6,<1.1 \
textproc/ruby-fastercsv,${MODRUBY_FLAVOR}>=1.5.0,<1.6 \
- www/ruby-rails,${MODRUBY_FLAVOR}>=3.2.12,<3.3 \
+ www/ruby-rails,${MODRUBY_FLAVOR}=3.2.13 \
www/ruby-jquery-rails,${MODRUBY_FLAVOR}>=2.0.2,<2.1
RUN_DEPENDS-extra = ${BASE_PKGPATH},-main
@@ -52,14 +49,15 @@ CUSTOM_GEMS += rmagick
.endif
.if ${FLAVOR:Mjruby}
-RUN_DEPENDS-main += databases/ruby-activerecord-jdbcmysql-adapter,${MODRUBY_FLAVOR} \
+BUILD_DEPENDS += lang/jruby>=1.7.0
+RUN_DEPENDS-main += databases/ruby-activerecord-jdbc-adapter,${MODRUBY_FLAVOR}=1.2.5 \
+ databases/ruby-activerecord-jdbcmysql-adapter,${MODRUBY_FLAVOR} \
databases/ruby-activerecord-jdbcpostgresql-adapter,${MODRUBY_FLAVOR} \
- databases/ruby-activerecord-jdbcsqlite3-adapter,${MODRUBY_FLAVOR} \
- security/ruby-jruby-openssl,${MODRUBY_FLAVOR}
-CUSTOM_GEMS += activerecord-jdbcmysql-adapter \
+ databases/ruby-activerecord-jdbcsqlite3-adapter,${MODRUBY_FLAVOR}
+CUSTOM_GEMS += activerecord-jdbc-adapter \
+ activerecord-jdbcmysql-adapter \
activerecord-jdbcpostgresql-adapter \
activerecord-jdbcsqlite3-adapter \
- jruby-openssl
.else
RUN_DEPENDS-main += databases/ruby-pg,${MODRUBY_FLAVOR}>=0.11.0 \
databases/ruby-sqlite3,${MODRUBY_FLAVOR}
@@ -78,7 +76,7 @@ CONFIGURE_STYLE = none
NO_BUILD = Yes
# Needs porting and updating a few things
-NO_REGRESS = Yes
+NO_TEST = Yes
LOCALSTATEDIR = ${BASELOCALSTATEDIR}/redmine
SYSCONFDIR = ${BASESYSCONFDIR}/redmine
View
@@ -1,2 +1,2 @@
-SHA256 (redmine-2.2.3.tar.gz) = KJ6Bd9QbM/TbOAWFJRco1+NSgzks0SxfIBaBWZ7zkQo=
-SIZE (redmine-2.2.3.tar.gz) = 3754504
+SHA256 (redmine-2.3.0.tar.gz) = 3cp83tWNP5FZ3oaOEg6k1wE6TYR0LAKN4zxJxTkDGr4=
+SIZE (redmine-2.3.0.tar.gz) = 3797442
@@ -1,6 +1,6 @@
$OpenBSD$
---- config/configuration.yml.example.orig Mon Feb 25 14:47:05 2013
-+++ config/configuration.yml.example Mon Feb 25 15:36:29 2013
+--- config/configuration.yml.example.orig Wed Mar 20 00:32:31 2013
++++ config/configuration.yml.example Thu Mar 21 14:32:13 2013
@@ -80,33 +80,27 @@
# default configuration options for all environments
@@ -45,7 +45,7 @@ $OpenBSD$
# Configuration of SCM executable command.
#
-@@ -145,7 +139,7 @@ default:
+@@ -151,7 +145,7 @@ default:
# * decrypt data using 'rake db:decrypt RAILS_ENV=production' first
# * change the cipher key here in your configuration file
# * encrypt data using 'rake db:encrypt RAILS_ENV=production'
@@ -54,7 +54,7 @@ $OpenBSD$
# Set this to false to disable plugins' assets mirroring on startup.
# You can use `rake redmine:plugins:assets` to manually mirror assets
-@@ -160,11 +154,11 @@ default:
+@@ -166,11 +160,11 @@ default:
#
# If you have a load-balancing Redmine cluster, you have to use the
# same secret token on each machine.
@@ -68,7 +68,7 @@ $OpenBSD$
# Configuration of RMagcik font.
#
-@@ -186,7 +180,11 @@ default:
+@@ -192,7 +186,11 @@ default:
# Linux:
# rmagick_font_path: /usr/share/fonts/ipa-mincho/ipam.ttf
#
@@ -79,5 +79,5 @@ $OpenBSD$
+ #
+ rmagick_font_path: ${LOCALBASE}/lib/X11/fonts/mplus/ipam.ttf
- # specific configuration options for production environment
- # that overrides the default ones
+ # Maximum number of simultaneous AJAX uploads
+ #max_concurrent_ajax_uploads: 2
@@ -1,14 +1,16 @@
$OpenBSD$
---- config/database.yml.example.orig Tue Feb 12 23:54:42 2013
-+++ config/database.yml.example Mon Feb 25 16:42:43 2013
-@@ -1,28 +1,23 @@
--# Default setup is given for MySQL with ruby1.8. If you're running Redmine
-+# Default setup is given for SQLite3 with ruby1.8. If you're running Redmine
- # with MySQL and ruby1.9, replace the adapter name with `mysql2`.
- # Examples for PostgreSQL and SQLite3 can be found at the end.
+--- config/database.yml.example.orig Wed Mar 20 00:32:31 2013
++++ config/database.yml.example Thu Mar 21 14:35:28 2013
+@@ -1,23 +1,14 @@
+-# Default setup is given for MySQL with ruby1.9. If you're running Redmine
+-# with MySQL and ruby1.8, replace the adapter name with `mysql`.
+-# Examples for PostgreSQL, SQLite3 and SQL Server can be found at the end.
++# Default setup is given for SQLite.
++# Examples for PostgreSQL, MySQL and SQL Server can be found at the end.
+ # Line indentation must be 2 spaces (no tabs).
production:
-- adapter: mysql
+- adapter: mysql2
- database: redmine
- host: localhost
- username: root
@@ -18,7 +20,7 @@ $OpenBSD$
+ database: ${LOCALSTATEDIR}/redmine.db
development:
-- adapter: mysql
+- adapter: mysql2
- database: redmine_development
- host: localhost
- username: root
@@ -29,13 +31,23 @@ $OpenBSD$
# Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake".
- # Do not set this db to the same as development or production.
-+
-+# If you're running Redmine with MySQL and ruby1.8, replace the adapter
-+# name `mysql2` with `mysql`.
- test:
-- adapter: mysql
-+ adapter: mysql2
- database: redmine_test
- host: localhost
- username: root
+@@ -38,10 +29,16 @@ test:
+ # username: postgres
+ # password: "postgres"
+
+-# SQLite3 configuration example
++# MySQL configuration example.
++# Default setup is given for MySQL with ruby1.9. If you're running Redmine
++# with MySQL and ruby1.8, replace the adapter name with `mysql`.
+ #production:
+-# adapter: sqlite3
+-# database: db/redmine.sqlite3
++# adapter: mysql2
++# database: redmine
++# host: localhost
++# username: root
++# password: ""
++# encoding: utf8
+
+ # SQL Server configuration example
+ #production:
Oops, something went wrong.

0 comments on commit 0167620

Please sign in to comment.