Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 10 Mar 2019 13:07:07 +0000 (UTC)
From:      Michael Reifenberger <mr@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r495292 - in head/security/ruby-bitwarden: . files
Message-ID:  <201903101307.x2AD77FF003265@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mr
Date: Sun Mar 10 13:07:06 2019
New Revision: 495292
URL: https://svnweb.freebsd.org/changeset/ports/495292

Log:
  Add rubywarden (formerly known as bitwarden-ruby)
  a small, self-contained API server written in Ruby and Sinatra to provide a private backend for the open-source Bitwarden apps.
  This port follows the bitwarden-ruby port which was created and maintained by feld@ but doesnt try to manage all ruby dependencies.

Added:
  head/security/ruby-bitwarden/
     - copied from r484199, head/security/bitwarden-ruby/
  head/security/ruby-bitwarden/files/pkg-message.in   (contents, props changed)
  head/security/ruby-bitwarden/files/rubywarden-api.in
     - copied, changed from r484199, head/security/bitwarden-ruby/files/bitwarden-api.in
Deleted:
  head/security/ruby-bitwarden/files/bitwarden-api.in
Modified:
  head/security/ruby-bitwarden/Makefile
  head/security/ruby-bitwarden/distinfo
  head/security/ruby-bitwarden/pkg-descr
  head/security/ruby-bitwarden/pkg-plist

Modified: head/security/ruby-bitwarden/Makefile
==============================================================================
--- head/security/bitwarden-ruby/Makefile	Mon Nov  5 16:34:56 2018	(r484199)
+++ head/security/ruby-bitwarden/Makefile	Sun Mar 10 13:07:06 2019	(r495292)
@@ -1,39 +1,30 @@
 # Created by: Mark Felder <feld@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	bitwarden-ruby
-DISTVERSION=	0.0.0.20180321
-CATEGORIES=	security www
+PORTNAME=	rubywarden
+DISTVERSION=	0.0.0.20190207
+CATEGORIES=	     security www
 
-MAINTAINER=	feld@FreeBSD.org
+MAINTAINER=	mr@FreeBSD.org
 COMMENT=	Ruby implementation of the BitWarden API
 
 LICENSE=	ISCL
 
-EXPIRATION_DATE=	2019-01-01
-DEPRECATED=	Expects very specific rubygem versions for new updates. Please follow instructions in git repo.
+RUN_DEPENDS=	rubygem-bundler>=1.16:sysutils/rubygem-bundler
 
-RUN_DEPENDS=	rubygem-sinatra>=2.0:www/rubygem-sinatra \
-		rubygem-sinatra-contrib>=2.0:www/rubygem-sinatra-contrib \
-		rubygem-unicorn>0:www/rubygem-unicorn \
-		rubygem-json>0:devel/rubygem-json \
-		rubygem-pbkdf2-ruby>0:security/rubygem-pbkdf2-ruby \
-		rubygem-rotp>0:devel/rubygem-rotp \
-		rubygem-jwt>0:www/rubygem-jwt \
-		rubygem-sqlite3>0:databases/rubygem-sqlite3 \
-		rubygem-rqrcode>0:www/rubygem-rqrcode
-
+USES=		sqlite
 USE_RUBY=	yes
 RUBY_NO_BUILD_DEPENDS=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jcs
-GH_TAGNAME=	c3e0eb1
+GH_TAGNAME=	5ba9f9821971942d082e327edcf7f02e8ad4c4a7
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
-USE_RC_SUBR=	bitwarden-api
+USE_RC_SUBR=	rubywarden-api
+SUB_FILES=	pkg-message
 SUB_LIST+=	RUBY_WITH_SUFFIX="${RUBY_WITH_SUFFIX}"
 
 do-install:
@@ -41,3 +32,4 @@ do-install:
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR})
 
 .include <bsd.port.mk>
+

Modified: head/security/ruby-bitwarden/distinfo
==============================================================================
--- head/security/bitwarden-ruby/distinfo	Mon Nov  5 16:34:56 2018	(r484199)
+++ head/security/ruby-bitwarden/distinfo	Sun Mar 10 13:07:06 2019	(r495292)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1521640545
-SHA256 (jcs-bitwarden-ruby-0.0.0.20180321-c3e0eb1_GH0.tar.gz) = ac041fcc37dabb6de5684e7c9be6984b9b443800558b8c645b7cf7b93b14cf05
-SIZE (jcs-bitwarden-ruby-0.0.0.20180321-c3e0eb1_GH0.tar.gz) = 30279
+TIMESTAMP = 1552216607
+SHA256 (jcs-rubywarden-0.0.0.20190207-5ba9f9821971942d082e327edcf7f02e8ad4c4a7_GH0.tar.gz) = 6dce8c391480726200d1f7a9d2f1fad4fe435f25a0c96427b3782ba96a8adbc2
+SIZE (jcs-rubywarden-0.0.0.20190207-5ba9f9821971942d082e327edcf7f02e8ad4c4a7_GH0.tar.gz) = 38046

Added: head/security/ruby-bitwarden/files/pkg-message.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/ruby-bitwarden/files/pkg-message.in	Sun Mar 10 13:07:06 2019	(r495292)
@@ -0,0 +1,9 @@
+*************************************************************************
+
+      After installation of this port you have to install the necessary
+      rubygem dependencies.
+
+      Follow the instructions in %%WWWDIR%%/README.md
+
+*************************************************************************
+

Copied and modified: head/security/ruby-bitwarden/files/rubywarden-api.in (from r484199, head/security/bitwarden-ruby/files/bitwarden-api.in)
==============================================================================
--- head/security/bitwarden-ruby/files/bitwarden-api.in	Mon Nov  5 16:34:56 2018	(r484199, copy source)
+++ head/security/ruby-bitwarden/files/rubywarden-api.in	Sun Mar 10 13:07:06 2019	(r495292)
@@ -4,41 +4,41 @@
 # $FreeBSD$
 #
 
-# PROVIDE: bitwarden-api
+# PROVIDE: rubywarden-api
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 #
-# Add the following line to /etc/rc.conf to enable `bitwarden-api':
+# Add the following line to /etc/rc.conf to enable `rubywarden-api':
 #
-# bitwarden_api_enable="YES"
+# rubywarden_api_enable="YES"
 
 . /etc/rc.subr
-name=bitwarden_api
+name=rubywarden_api
 
-rcvar=bitwarden_api_enable
+rcvar=rubywarden_api_enable
 load_rc_config ${name}
 
-: ${bitwarden_api_enable:=NO}
-: ${bitwarden_api_port:=4567}
-: ${bitwarden_api_signups:=NO}
-: ${bitwarden_api_user:=www}
-: ${bitwarden_api_group:=www}
-: ${bitwarden_api_chdir=/usr/local/www/bitwarden-ruby}
+: ${rubywarden_api_enable:=NO}
+: ${rubywarden_api_port:=4567}
+: ${rubywarden_api_signups:=NO}
+: ${rubywarden_api_user:=www}
+: ${rubywarden_api_group:=www}
+: ${rubywarden_api_chdir=/usr/local/www/rubywarden}
 
-pidfile="/var/run/bitwarden/${name}.pid"
+pidfile="/var/run/rubywarden/${name}.pid"
 procname=%%RUBY_WITH_SUFFIX%%
 command="%%PREFIX%%/bin/rackup"
-command_args="-P ${pidfile} -p ${bitwarden_api_port} -E production config.ru 2>&1 | logger -t bitwarden &"
+command_args="-P ${pidfile} -p ${rubywarden_api_port} -E production config.ru 2>&1 | logger -t rubywarden &"
 start_precmd="start_precmd"
 
 start_precmd()
 {
-        if [ ! -e /var/run/bitwarden ] ; then
-                install -d -o ${bitwarden_api_user} -g ${bitwarden_api_group} /var/run/bitwarden;
+        if [ ! -e /var/run/rubywarden ] ; then
+                install -d -o ${rubywarden_api_user} -g ${rubywarden_api_group} /var/run/rubywarden;
         fi
 
-        checkyesno bitwarden_api_signups
+        checkyesno rubywarden_api_signups
         if [ "$?" -eq 0 ]; then
                 export ALLOW_SIGNUPS=1
                 echo "Bitwarden Signups Enabled"

Modified: head/security/ruby-bitwarden/pkg-descr
==============================================================================
--- head/security/bitwarden-ruby/pkg-descr	Mon Nov  5 16:34:56 2018	(r484199)
+++ head/security/ruby-bitwarden/pkg-descr	Sun Mar 10 13:07:06 2019	(r495292)
@@ -1,4 +1,4 @@
 A small, self-contained API server written in Ruby and Sinatra to
 provide a private backend for the open-source Bitwarden apps.
 
-WWW: https://github.com/jcs/bitwarden-ruby
+WWW: https://github.com/jcs/rubywarden

Modified: head/security/ruby-bitwarden/pkg-plist
==============================================================================
--- head/security/bitwarden-ruby/pkg-plist	Mon Nov  5 16:34:56 2018	(r484199)
+++ head/security/ruby-bitwarden/pkg-plist	Sun Mar 10 13:07:06 2019	(r495292)
@@ -1,38 +1,56 @@
+%%WWWDIR%%/.gitignore
 %%WWWDIR%%/API.md
+%%WWWDIR%%/AR-MIGRATE.md
 %%WWWDIR%%/Gemfile
 %%WWWDIR%%/Gemfile.lock
 %%WWWDIR%%/LICENSE
 %%WWWDIR%%/README.md
 %%WWWDIR%%/Rakefile
 %%WWWDIR%%/config.ru
-@owner www
 %%WWWDIR%%/db/.gitkeep
-@owner
+%%WWWDIR%%/db/config.yml
+%%WWWDIR%%/db/migrate/201803%%RUBY_SUFFIX%%145941_create_users.rb
+%%WWWDIR%%/db/migrate/201803%%RUBY_SUFFIX%%151103_create_devices.rb
+%%WWWDIR%%/db/migrate/201803%%RUBY_SUFFIX%%151113_create_folders.rb
+%%WWWDIR%%/db/migrate/201803%%RUBY_SUFFIX%%151117_create_ciphers.rb
+%%WWWDIR%%/db/migrate/20180518070354_set_default_value_for_favorite.rb
+%%WWWDIR%%/db/migrate/20180818095054_create_attachments.rb
+%%WWWDIR%%/db/migrate/20180818201731_user_kdf_iterations.rb
+%%WWWDIR%%/db/migrate/20180818212323_add_user_kdf_type.rb
 %%WWWDIR%%/lib/app.rb
+%%WWWDIR%%/lib/attachment.rb
 %%WWWDIR%%/lib/bitwarden.rb
-%%WWWDIR%%/lib/bitwarden_ruby.rb
 %%WWWDIR%%/lib/cipher.rb
 %%WWWDIR%%/lib/db.rb
 %%WWWDIR%%/lib/dbmodel.rb
 %%WWWDIR%%/lib/device.rb
 %%WWWDIR%%/lib/folder.rb
 %%WWWDIR%%/lib/helper.rb
-%%WWWDIR%%/lib/user.rb
+%%WWWDIR%%/lib/helpers/attachment_helpers.rb
 %%WWWDIR%%/lib/helpers/request_helpers.rb
 %%WWWDIR%%/lib/routes/api.rb
+%%WWWDIR%%/lib/routes/attachments.rb
 %%WWWDIR%%/lib/routes/icons.rb
 %%WWWDIR%%/lib/routes/identity.rb
+%%WWWDIR%%/lib/rubywarden.rb
+%%WWWDIR%%/lib/user.rb
+%%WWWDIR%%/spec/attachment_spec.rb
+%%WWWDIR%%/spec/bitwarden_importer_spec.rb
 %%WWWDIR%%/spec/cipher_spec.rb
 %%WWWDIR%%/spec/cipherstring_spec.rb
 %%WWWDIR%%/spec/db_spec.rb
+%%WWWDIR%%/spec/fixtures/bitwarden_export.csv
 %%WWWDIR%%/spec/folder_spec.rb
 %%WWWDIR%%/spec/icon_spec.rb
 %%WWWDIR%%/spec/identity_spec.rb
 %%WWWDIR%%/spec/spec_helper.rb
+%%WWWDIR%%/spec/user_spec.rb
 %%WWWDIR%%/tools/1password_import.rb
 %%WWWDIR%%/tools/activate_totp.rb
 %%WWWDIR%%/tools/bitwarden_import.rb
+%%WWWDIR%%/tools/change_master_password.rb
 %%WWWDIR%%/tools/keepass_import.rb
 %%WWWDIR%%/tools/lastpass_import.rb
+%%WWWDIR%%/tools/migrate_to_ar.rb
 %%WWWDIR%%/tools/mitm.rb
 @dir(www,www,0750) %%WWWDIR%%/db



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903101307.x2AD77FF003265>