fix(signing): remove entitlements which I believe caused the app to not launch

feat(signing); add a number of additional entitlements
The list of additional entitlements have been picked mostly on a best-guess basis of what's reasonable.
2026-02-19 13:06:38 +00:00 · 2021-11-28 13:43:34 +00:00 · 2021-11-27 23:55:30 +00:00
17 changed files with 85 additions and 818 deletions
--- a/3
+++ b/3
@@ -3,7 +3,6 @@
 brew 'autoconf'
 brew 'coreutils'
 brew 'curl'
-brew 'dbus'
 brew 'expat'
 brew 'gcc'
 brew 'gmp'
@@ -23,7 +22,5 @@ brew 'make'
 brew 'ncurses'
 brew 'nettle'
 brew 'pkg-config'
-brew 'sqlite'
 brew 'texinfo'
-brew 'tree-sitter'
 brew 'zlib'
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,92 +2,6 @@

 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

-### [0.6.38](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.37...v0.6.38) (2022-12-01)
-
-
-### Features
-
-* **patch:** add round-undecorated-frame from emacs-plus for 29.x ([48a512f](https://github.com/jimeh/build-emacs-for-macos/commit/48a512fbce79759caa987e2880585bd0bc937977))
-* **patch:** add support for experimental poll patch from emacs-plus for 29.x ([a3530c0](https://github.com/jimeh/build-emacs-for-macos/commit/a3530c02e8260106f87d464e5cb398dcb2819460))
-
-### [0.6.37](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.36...v0.6.37) (2022-12-01)
-
-
-### Features
-
-* **tree-sitter:** support new --with-tree-sitter configure flag ([0ba971e](https://github.com/jimeh/build-emacs-for-macos/commit/0ba971ef61a195c91e87aa381d5d3b044461b4f6))
-
-### [0.6.36](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.35...v0.6.36) (2022-10-08)
-
-
-### Bug Fixes
-
-* **native-comp:** support new configure flag format ([1f2868d](https://github.com/jimeh/build-emacs-for-macos/commit/1f2868d4b3784e906665e9f3b6b9bba8fd72292f)), closes [#76](https://github.com/jimeh/build-emacs-for-macos/issues/76)
-
-### [0.6.35](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.34...v0.6.35) (2022-08-10)
-
-
-### Bug Fixes
-
-* **native-comp:** compatibility with libgccjit 12 homebrew formula ([e0fd2b1](https://github.com/jimeh/build-emacs-for-macos/commit/e0fd2b16eb91ac5a98ed4ec31f4773ab22cbd470))
-
-### [0.6.34](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.33...v0.6.34) (2022-07-27)
-
-
-### Bug Fixes
-
-* **emacs-28:** patch configure.ac to support latest libgccjit ([b582523](https://github.com/jimeh/build-emacs-for-macos/commit/b582523642ad4c5298f5a7890edd9b48c0433684)), closes [#72](https://github.com/jimeh/build-emacs-for-macos/issues/72)
-
-### [0.6.33](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.32...v0.6.33) (2022-04-30)
-
-### [0.6.32](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.31...v0.6.32) (2022-04-30)
-
-
-### Features
-
-* **dbus:** add flag to explicitly disable dbus support ([8ad3ff4](https://github.com/jimeh/build-emacs-for-macos/commit/8ad3ff4f53505408aa097527177032a1fd6008e0)), closes [#69](https://github.com/jimeh/build-emacs-for-macos/issues/69)
-* **deps:** add sqlite brew dependency for Emacs 29.x ([a20a845](https://github.com/jimeh/build-emacs-for-macos/commit/a20a8456ab1e8de6357d5d121b9565ba65a6dd71))
-
-
-### Bug Fixes
-
-* **native-comp:** support libgccjit 11.3.0 ([e31f5aa](https://github.com/jimeh/build-emacs-for-macos/commit/e31f5aaf9355b674c2a86b8eda35f6513f344b72)), closes [#71](https://github.com/jimeh/build-emacs-for-macos/issues/71)
-
-### [0.6.31](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.30...v0.6.31) (2022-02-25)
-
-
-### Bug Fixes
-
-* set source-directory correctly ([07e0e3d](https://github.com/jimeh/build-emacs-for-macos/commit/07e0e3dacddfbdb7a59aceaa2dc9cdf503ac2bcc)), closes [#68](https://github.com/jimeh/build-emacs-for-macos/issues/68)
-
-### [0.6.30](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.29...v0.6.30) (2022-02-08)
-
-
-### Bug Fixes
-
-* **site-lisp:** add Homebrew's site-lisp directory to locallisppath ([cbd8cb2](https://github.com/jimeh/build-emacs-for-macos/commit/cbd8cb27b6ceff2e128c38cd1cc8f8380b9b4bfb))
-
-### [0.6.29](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.28...v0.6.29) (2022-02-07)
-
-
-### Features
-
-* **cask:** add support for pretest builds ([084776d](https://github.com/jimeh/build-emacs-for-macos/commit/084776db6b7e61958088d7b2a2588e9889e60c21))
-
-### [0.6.28](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.27...v0.6.28) (2022-01-15)
-
-
-### Features
-
-* **build:** add dbus dependency to enable support in Emacs builds ([68ef4c0](https://github.com/jimeh/build-emacs-for-macos/commit/68ef4c066c3fd1a7337198e8f773866088b4f481))
-
-### [0.6.27](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.26...v0.6.27) (2021-12-05)
-
-
-### Features
-
-* **plan:** add support for pretest and release candidate builds ([743b10c](https://github.com/jimeh/build-emacs-for-macos/commit/743b10c751e146ec7569f39a475c20a0489955f4))
-
 ### [0.6.26](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.25...v0.6.26) (2021-11-27)


--- a/133
+++ b/133
@@ -250,40 +250,14 @@ class Build
    @supports_xwidgets ||= !!configure_help.match(/\s+--with-xwidgets\s+/)
  end

-  def supports_tree_sitter?
-    @supports_tree_sitter ||= !!configure_help.match(
-      /\s+--with-tree-sitter(\s|=).+/
-    )
-  end
-
  def supports_native_comp?
    @supports_native_comp ||= !native_comp_configure_flag.nil?
  end

-  def native_comp_configure_match
-    @native_comp_configure_match ||= configure_help.match(
-      /\s+?(--with-native(?:comp|-compilation))(.+)?\s+?/
-    )
-  end
-
  def native_comp_configure_flag
-    return @native_comp_configure_flag if @native_comp_configure_flag
-
-    return unless native_comp_configure_match&.[](1)
-
-    @native_comp_configure_flag = [
-      native_comp_configure_match[1],
-      native_comp_configure_flag_arg
-    ].compact.join('=')
-  end
-
-  def native_comp_configure_flag_arg
-    return @native_comp_configure_flag_arg if @native_comp_configure_flag_arg
-
-    return if native_comp_configure_match&.[](2) != '[=TYPE]'
-
-    @native_comp_configure_flag_arg = \
-      (options[:native_full_aot] ? 'aot' : 'yes')
+    @native_comp_configure_flag ||= configure_help.match(
+      /\s+(--with-native(?:comp|-compilation))\s+/
+    )&.[](1)
  end

  def detect_native_comp
@@ -385,20 +359,15 @@ class Build
        '--with-modules',
        '--enable-locallisppath=' \
        '/Library/Application Support/Emacs/${version}/site-lisp:' \
-        '/Library/Application Support/Emacs/site-lisp:' \
-        '/usr/local/share/emacs/site-lisp'
+        '/Library/Application Support/Emacs/site-lisp'
      ]
      if options[:xwidgets] && supports_xwidgets?
        configure_flags << '--with-xwidgets'
      end
-      if options[:tree_sitter] && supports_tree_sitter?
-        configure_flags << '--with-tree-sitter'
-      end
      configure_flags << native_comp_configure_flag if options[:native_comp]
      configure_flags << '--without-rsvg' if options[:rsvg] == false
-      configure_flags << '--without-dbus' if options[:dbus] == false

-      run_cmd './configure', *configure_flags.compact
+      run_cmd './configure', *configure_flags

      # Disable aligned_alloc on Mojave and below. See issue:
      # https://github.com/daviderestivo/homebrew-emacs-head/issues/15
@@ -415,12 +384,8 @@ class Build
        make_flags << "BYTE_COMPILE_EXTRA_FLAGS=--eval '(setq comp-speed 2)'"

        if options[:native_full_aot]
-          info 'Using native compile full AOT'
-          # We do not need to supply the full AOT make arg if
-          # --with-native-compilation=aot configure flag is supported.
-          unless native_comp_configure_flag_arg
-            make_flags << 'NATIVE_FULL_AOT=1'
-          end
+          info 'Using NATIVE_FULL_AOT=1'
+          make_flags << 'NATIVE_FULL_AOT=1'
          ENV.delete('NATIVE_FAST_BOOT')
        else
          ENV.delete('NATIVE_FULL_AOT')
@@ -428,7 +393,7 @@ class Build
        end
      end

-      run_cmd 'make', *make_flags.compact
+      run_cmd 'make', *make_flags
      run_cmd 'make', 'install'
    end

@@ -695,19 +660,6 @@ class Build
      end
    end

-    if effective_version == 'emacs-29'
-      p << {
-        url: 'https://github.com/d12frosted/homebrew-emacs-plus/raw/master/' \
-             "patches/#{effective_version}/round-undecorated-frame.patch"
-      }
-      if options[:poll]
-        p << {
-          url: 'https://github.com/d12frosted/homebrew-emacs-plus/raw/master/' \
-               "patches/#{effective_version}/poll.patch"
-        }
-      end
-    end
-
    if %w[emacs-28 emacs-29].include?(effective_version)
      if options[:posix_spawn]
        p << {
@@ -717,28 +669,6 @@ class Build
      end
    end

-    if effective_version == 'emacs-28'
-      p << {
-        replace: [
-          'configure.ac',
-          'grep libgccjit.so\$',
-          'grep -E \'libgccjit\.(so|dylib)$\''
-        ],
-        allow_failure: true
-      }
-    end
-
-    if %w[emacs-28 emacs-29].include?(effective_version)
-      p << {
-        replace: [
-          'configure.ac',
-          'grep -E \'libgccjit\.(so|dylib)$\'',
-          'grep -E \'libgccjit\.(so|dylib)$\' | tail -1'
-        ],
-        allow_failure: true
-      }
-    end
-
    if effective_version == 'emacs-27'
      p << {
        url: 'https://github.com/d12frosted/homebrew-emacs-plus/raw/master/' \
@@ -788,34 +718,17 @@ class Build
      err 'Patch replace input error' unless patch[:replace].size == 3

      file, before, after = patch[:replace]
-      info "Applying patch to #{file}..."
      filepath = File.join(target, file)

-      unless File.exist?(filepath)
-        if patch[:allow_failure]
-          info "File #{filepath} does not exist, skipping patch."
-          return
-        end
-
-        err "\"#{file}\" does not exist in #{target}"
-      end
+      err "\"#{file}\" does not exist in #{target}" unless File.exist?(filepath)

      f = File.open(filepath, 'rb')
      s = f.read
      sub = s.gsub!(before, after)
-
-      if sub.nil?
-        if patch[:allow_failure]
-          info 'Patch did not apply, skipping.'
-          return
-        end
-
-        err "Replacement failed in #{file}"
-      end
+      err "Replacement filed in #{file}" if sub.nil?

      f.reopen(filepath, 'wb').write(s)
      f.close
-      info "#{file} patched."
    end
  end

@@ -898,8 +811,7 @@ end
 class CSourcesEmbedder < AbstractEmbedder
  PATH_PATCH = <<~ELISP
    ;; Allow Emacs to find bundled C sources.
-    (setq source-directory
-      (expand-file-name ".." (file-name-directory load-file-name)))
+    (setq source-directory (expand-file-name ".."))
  ELISP

  attr_reader :source_dir
@@ -1212,8 +1124,7 @@ class GccInfo

  def libgccjit_lib_dir
    @libgccjit_lib_dir ||= Dir[
-      File.join(libgccjit_root_dir, 'lib/gcc/*/libgccjit*.dylib'),
-      File.join(libgccjit_root_dir, 'lib/gcc/*/libgccjit.so*'),
+      File.join(libgccjit_root_dir, 'lib/gcc/*/libgccjit.so*')
    ]
                           .map { |path| File.dirname(path) }
                           .select { |path| File.basename(path).match(/^\d+$/) }
@@ -1263,9 +1174,7 @@ if __FILE__ == $PROGRAM_NAME
    native_march: false,
    parallel: Etc.nprocessors,
    rsvg: true,
-    dbus: true,
    xwidgets: true,
-    tree_sitter: true,
    github_auth: true,
    dist_include: ['COPYING'],
    archive: true,
@@ -1301,12 +1210,6 @@ if __FILE__ == $PROGRAM_NAME
        cli_options[:xwidgets] = v
      end

-      opts.on('--[no-]tree-sitter',
-              'Enable/disable tree-sitter if supported' \
-              '(default: enabled)') do |v|
-        cli_options[:tree_sitter] = v
-      end
-
      opts.on('--[no-]native-comp',
              'Enable/disable native-comp ' \
              '(default: enabled if supported)') do |v|
@@ -1337,11 +1240,6 @@ if __FILE__ == $PROGRAM_NAME
        cli_options[:rsvg] = v
      end

-      opts.on('--[no-]dbus',
-              'Enable/disable dbus support (default: enabled)') do |v|
-        cli_options[:dbus] = v
-      end
-
      opts.on('--no-titlebar', 'Apply no-titlebar patch (default: disabled)') do
        cli_options[:no_titlebar] = true
      end
@@ -1355,13 +1253,6 @@ if __FILE__ == $PROGRAM_NAME
        cli_options[:no_frame_refocus] = true
      end

-      opts.on('--[no-]poll',
-              'Enable/disable experimental use of poll() instead of select() ' \
-              'to support > 1024 file descriptors ' \
-              '(default: disabled)') do |v|
-        cli_options[:poll] = v
-      end
-
      opts.on('--[no-]github-auth',
              'Make authenticated GitHub API requests if GITHUB_TOKEN ' \
              'environment variable is set.' \
--- a/go.mod
+++ b/go.mod
@@ -16,7 +16,7 @@ require (
 	github.com/hexops/gotextdiff v1.0.3
 	github.com/jimeh/undent v1.1.0
 	github.com/mattn/go-isatty v0.0.13 // indirect
-	github.com/mitchellh/gon v0.2.5
+	github.com/mitchellh/gon v0.2.3
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/stretchr/testify v1.7.0
 	github.com/urfave/cli/v2 v2.3.0
--- a/go.sum
+++ b/go.sum
@@ -160,8 +160,8 @@ github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Ky
 github.com/mattn/go-isatty v0.0.13 h1:qdl+GuBjcsKKDco5BsxPJlId98mSWNKqYA+Co0SC1yA=
 github.com/mattn/go-isatty v0.0.13/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
-github.com/mitchellh/gon v0.2.5 h1:mVWtqTzV03W0avJqmqjk9M0qls3TDUXfc9ETJaPIOWY=
-github.com/mitchellh/gon v0.2.5/go.mod h1:Ua18ZhqjZHg8VyqZo8kNHAY331ntV6nNJ9mT3s2mIo8=
+github.com/mitchellh/gon v0.2.3 h1:fObN7hD14VacGG++t27GzTW6opP0lwI7TsgTPL55wBo=
+github.com/mitchellh/gon v0.2.3/go.mod h1:Ua18ZhqjZHg8VyqZo8kNHAY331ntV6nNJ9mT3s2mIo8=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
--- a/helper/emacs-cli.bash
+++ b/helper/emacs-cli.bash
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash

 resolve_link() {
-  "$(command -v greadlink || command -v readlink)" "$1"
+  "$(type -p greadlink readlink | head -1)" "$1"
 }

 abs_dirname() {
--- a/pkg/cask/update.go
+++ b/pkg/cask/update.go
@@ -393,7 +393,9 @@ func (s *Updater) renderCask(
 		filename := asset.GetName()
 		s.logger.Debug("processing asset", "filename", filename)

-		filename = strings.TrimSuffix(filename, ".sha256")
+		if strings.HasSuffix(filename, ".sha256") {
+			filename = strings.TrimSuffix(filename, ".sha256")
+		}

 		if _, ok := info.Assets[filename]; !ok {
 			info.Assets[filename] = &ReleaseAsset{
--- a/pkg/plan/create.go
+++ b/pkg/plan/create.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"io"
 	"regexp"
-	"strconv"
 	"strings"

 	"github.com/hashicorp/go-hclog"
@@ -14,13 +13,10 @@ import (
 	"github.com/jimeh/build-emacs-for-macos/pkg/osinfo"
 	"github.com/jimeh/build-emacs-for-macos/pkg/release"
 	"github.com/jimeh/build-emacs-for-macos/pkg/repository"
-	"github.com/jimeh/build-emacs-for-macos/pkg/sanitize"
 	"github.com/jimeh/build-emacs-for-macos/pkg/source"
 )

-var gitTagMatcher = regexp.MustCompile(
-	`^emacs(-.*)?-((\d+\.\d+)(?:\.(\d+))?(-rc\d+)?(.+)?)$`,
-)
+var nonAlphaNum = regexp.MustCompile(`[^\w_-]+`)

 type TestBuildType string

@@ -41,7 +37,7 @@ type Options struct {
 	Output        io.Writer
 }

-func Create(ctx context.Context, opts *Options) (*Plan, error) { //nolint:funlen
+func Create(ctx context.Context, opts *Options) (*Plan, error) {
 	logger := hclog.FromContext(ctx).Named("plan")

 	repo, err := repository.NewGitHub(opts.EmacsRepo)
@@ -70,36 +66,19 @@ func Create(ctx context.Context, opts *Options) (*Plan, error) { //nolint:funlen
 		return nil, err
 	}

-	absoluteVersion := fmt.Sprintf(
+	version := fmt.Sprintf(
 		"%s.%s.%s",
 		commitInfo.DateString(),
 		commitInfo.ShortSHA(),
-		sanitize.String(opts.Ref),
+		sanitizeString(opts.Ref),
 	)

-	version, channel, err := parseGitRef(opts.Ref)
-	if err != nil {
-		return nil, err
-	}
-
-	var releaseName string
-	switch channel {
-	case release.Stable, release.RC:
-		releaseName = "Emacs-" + version
-	case release.Pretest:
-		version += "-pretest"
-		absoluteVersion += "-pretest"
-		releaseName = "Emacs-" + version
-	default:
-		version = absoluteVersion
-		releaseName = "Emacs." + version
-	}
-
+	releaseName := fmt.Sprintf("Emacs.%s", version)
 	buildName := fmt.Sprintf(
 		"Emacs.%s.%s.%s",
-		absoluteVersion,
-		sanitize.String(osInfo.Name+"-"+osInfo.DistinctVersion()),
-		sanitize.String(osInfo.Arch),
+		version,
+		sanitizeString(osInfo.Name+"-"+osInfo.DistinctVersion()),
+		sanitizeString(osInfo.Arch),
 	)
 	diskImage := buildName + ".dmg"

@@ -118,8 +97,7 @@ func Create(ctx context.Context, opts *Options) (*Plan, error) { //nolint:funlen
 		OS: osInfo,
 		Release: &Release{
 			Name:       releaseName,
-			Prerelease: channel != release.Stable,
-			Channel:    channel,
+			Prerelease: true,
 		},
 		Output: &Output{
 			Directory: opts.OutputDir,
@@ -127,18 +105,28 @@ func Create(ctx context.Context, opts *Options) (*Plan, error) { //nolint:funlen
 		},
 	}

+	// If given git ref is a stable release tag (emacs-23.2b, emacs-27.2, etc.)
+	// we modify release properties accordingly.
+	if v, err := release.GitRefToStableVersion(opts.Ref); err == nil {
+		plan.Release.Prerelease = false
+		plan.Release.Name, err = release.VersionToName(v)
+		if err != nil {
+			return nil, err
+		}
+	}
+
 	if opts.TestBuild != "" {
-		testName := sanitize.String(opts.TestBuild)
+		testName := sanitizeString(opts.TestBuild)

 		plan.Build.Name += ".test." + testName
-		plan.Release.Title = "Test Builds (" + testName + ")"
+		plan.Release.Title = "Test Builds"
 		plan.Release.Name = "test-builds"

-		plan.Release.Prerelease = false
-		plan.Release.Draft = true
-		if opts.TestBuildType == Prerelease {
-			plan.Release.Prerelease = true
-			plan.Release.Draft = false
+		plan.Release.Prerelease = true
+		plan.Release.Draft = false
+		if opts.TestBuildType == Draft {
+			plan.Release.Prerelease = false
+			plan.Release.Draft = true
 		}

 		index := strings.LastIndex(diskImage, ".")
@@ -149,35 +137,6 @@ func Create(ctx context.Context, opts *Options) (*Plan, error) { //nolint:funlen
 	return plan, nil
 }

-func parseGitRef(ref string) (string, release.Channel, error) {
-	m := gitTagMatcher.FindStringSubmatch(ref)
-
-	if len(m) == 0 {
-		return "", release.Nightly, nil
-	}
-
-	if strings.Contains(m[1], "pretest") {
-		return m[2], release.Pretest, nil
-	}
-
-	if m[4] != "" {
-		n, err := strconv.Atoi(m[4])
-		if err != nil {
-			return "", "", err
-		}
-
-		if n >= 90 {
-			return m[2], release.Pretest, nil
-		}
-	}
-
-	if strings.HasPrefix(m[5], "-rc") {
-		return m[2], release.RC, nil
-	}
-
-	if m[2] == m[3] {
-		return m[2], release.Stable, nil
-	}
-
-	return "", "", nil
+func sanitizeString(s string) string {
+	return nonAlphaNum.ReplaceAllString(s, "-")
 }
--- a/pkg/plan/create_test.go
+++ b/pkg/plan/create_test.go
@@ -1,421 +0,0 @@
-package plan
-
-import (
-	"testing"
-
-	"github.com/jimeh/build-emacs-for-macos/pkg/release"
-	"github.com/stretchr/testify/assert"
-)
-
-func Test_parseGitRef(t *testing.T) {
-	t.Parallel()
-
-	type args struct {
-		ref string
-	}
-	type want struct {
-		version string
-		channel release.Channel
-		err     string
-	}
-	tests := []struct {
-		name string
-		args args
-		want want
-	}{
-		{
-			name: "master",
-			args: args{ref: "master"},
-			want: want{version: "", channel: release.Nightly, err: ""},
-		},
-		{
-			name: "emacs-28",
-			args: args{ref: "emacs-28"},
-			want: want{version: "", channel: release.Nightly, err: ""},
-		},
-		{
-			name: "emacs-27",
-			args: args{ref: "emacs-27"},
-			want: want{version: "", channel: release.Nightly, err: ""},
-		},
-		{
-			name: "emacs-26",
-			args: args{ref: "emacs-26"},
-			want: want{version: "", channel: release.Nightly, err: ""},
-		},
-		{
-			name: "emacs-24",
-			args: args{ref: "emacs-24"},
-			want: want{version: "", channel: release.Nightly, err: ""},
-		},
-		{
-			name: "feature/native-comp",
-			args: args{ref: "feature/native-comp"},
-			want: want{version: "", channel: release.Nightly, err: ""},
-		},
-		{
-			name: "feature/pgtk",
-			args: args{ref: "feature/pgtk"},
-			want: want{version: "", channel: release.Nightly, err: ""},
-		},
-		{
-			name: "emacs-19.34",
-			args: args{ref: "emacs-19.34"},
-			want: want{version: "19.34", channel: release.Stable, err: ""},
-		},
-		{
-			name: "emacs-20.4",
-			args: args{ref: "emacs-20.4"},
-			want: want{version: "20.4", channel: release.Stable, err: ""},
-		},
-		{
-			name: "emacs-22.3",
-			args: args{ref: "emacs-22.3"},
-			want: want{version: "22.3", channel: release.Stable, err: ""},
-		},
-		{
-			name: "emacs-23.4",
-			args: args{ref: "emacs-23.4"},
-			want: want{version: "23.4", channel: release.Stable, err: ""},
-		},
-		{
-			name: "emacs-24.0.97",
-			args: args{ref: "emacs-24.0.97"},
-			want: want{version: "24.0.97", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-24.2",
-			args: args{ref: "emacs-24.2"},
-			want: want{version: "24.2", channel: release.Stable, err: ""},
-		},
-		{
-			name: "emacs-24.2.90",
-			args: args{ref: "emacs-24.2.90"},
-			want: want{version: "24.2.90", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-24.2.93",
-			args: args{ref: "emacs-24.2.93"},
-			want: want{version: "24.2.93", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-24.3",
-			args: args{ref: "emacs-24.3"},
-			want: want{version: "24.3", channel: release.Stable, err: ""},
-		},
-		{
-			name: "emacs-24.3-rc1",
-			args: args{ref: "emacs-24.3-rc1"},
-			want: want{version: "24.3-rc1", channel: release.RC, err: ""},
-		},
-		{
-			name: "emacs-24.3.90",
-			args: args{ref: "emacs-24.3.90"},
-			want: want{version: "24.3.90", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-24.3.94",
-			args: args{ref: "emacs-24.3.94"},
-			want: want{version: "24.3.94", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-24.4",
-			args: args{ref: "emacs-24.4"},
-			want: want{version: "24.4", channel: release.Stable, err: ""},
-		},
-		{
-			name: "emacs-24.4-rc1",
-			args: args{ref: "emacs-24.4-rc1"},
-			want: want{version: "24.4-rc1", channel: release.RC, err: ""},
-		},
-		{
-			name: "emacs-24.4.90",
-			args: args{ref: "emacs-24.4.90"},
-			want: want{version: "24.4.90", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-24.4.91",
-			args: args{ref: "emacs-24.4.91"},
-			want: want{version: "24.4.91", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-24.5",
-			args: args{ref: "emacs-24.5"},
-			want: want{version: "24.5", channel: release.Stable, err: ""},
-		},
-		{
-			name: "emacs-24.5-rc1",
-			args: args{ref: "emacs-24.5-rc1"},
-			want: want{version: "24.5-rc1", channel: release.RC, err: ""},
-		},
-		{
-			name: "emacs-24.5-rc3",
-			args: args{ref: "emacs-24.5-rc3"},
-			want: want{version: "24.5-rc3", channel: release.RC, err: ""},
-		},
-		{
-			name: "emacs-24.5-rc3-fixed",
-			args: args{ref: "emacs-24.5-rc3-fixed"},
-			want: want{version: "24.5-rc3-fixed", channel: release.RC, err: ""},
-		},
-		{
-			name: "emacs-25.0.90",
-			args: args{ref: "emacs-25.0.90"},
-			want: want{version: "25.0.90", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-25.0.95",
-			args: args{ref: "emacs-25.0.95"},
-			want: want{version: "25.0.95", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-25.1",
-			args: args{ref: "emacs-25.1"},
-			want: want{version: "25.1", channel: release.Stable, err: ""},
-		},
-		{
-			name: "emacs-25.1-rc1",
-			args: args{ref: "emacs-25.1-rc1"},
-			want: want{version: "25.1-rc1", channel: release.RC, err: ""},
-		},
-		{
-			name: "emacs-25.1-rc2",
-			args: args{ref: "emacs-25.1-rc2"},
-			want: want{version: "25.1-rc2", channel: release.RC, err: ""},
-		},
-		{
-			name: "emacs-25.1.90",
-			args: args{ref: "emacs-25.1.90"},
-			want: want{version: "25.1.90", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-25.1.91",
-			args: args{ref: "emacs-25.1.91"},
-			want: want{version: "25.1.91", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-25.2",
-			args: args{ref: "emacs-25.2"},
-			want: want{version: "25.2", channel: release.Stable, err: ""},
-		},
-		{
-			name: "emacs-25.2-rc1",
-			args: args{ref: "emacs-25.2-rc1"},
-			want: want{version: "25.2-rc1", channel: release.RC, err: ""},
-		},
-		{
-			name: "emacs-25.2-rc2",
-			args: args{ref: "emacs-25.2-rc2"},
-			want: want{version: "25.2-rc2", channel: release.RC, err: ""},
-		},
-		{
-			name: "emacs-26.0.90",
-			args: args{ref: "emacs-26.0.90"},
-			want: want{version: "26.0.90", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-26.0.91",
-			args: args{ref: "emacs-26.0.91"},
-			want: want{version: "26.0.91", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-26.1",
-			args: args{ref: "emacs-26.1"},
-			want: want{version: "26.1", channel: release.Stable, err: ""},
-		},
-		{
-			name: "emacs-26.1-rc1",
-			args: args{ref: "emacs-26.1-rc1"},
-			want: want{version: "26.1-rc1", channel: release.RC, err: ""},
-		},
-		{
-			name: "emacs-26.1.90",
-			args: args{ref: "emacs-26.1.90"},
-			want: want{version: "26.1.90", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-26.1.92",
-			args: args{ref: "emacs-26.1.92"},
-			want: want{version: "26.1.92", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-26.2",
-			args: args{ref: "emacs-26.2"},
-			want: want{version: "26.2", channel: release.Stable, err: ""},
-		},
-		{
-			name: "emacs-26.2.90",
-			args: args{ref: "emacs-26.2.90"},
-			want: want{version: "26.2.90", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-26.3",
-			args: args{ref: "emacs-26.3"},
-			want: want{version: "26.3", channel: release.Stable, err: ""},
-		},
-		{
-			name: "emacs-26.3-rc1",
-			args: args{ref: "emacs-26.3-rc1"},
-			want: want{version: "26.3-rc1", channel: release.RC, err: ""},
-		},
-		{
-			name: "emacs-27.0.90",
-			args: args{ref: "emacs-27.0.90"},
-			want: want{version: "27.0.90", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-27.0.91",
-			args: args{ref: "emacs-27.0.91"},
-			want: want{version: "27.0.91", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-27.1",
-			args: args{ref: "emacs-27.1"},
-			want: want{version: "27.1", channel: release.Stable, err: ""},
-		},
-		{
-			name: "emacs-27.1-rc1",
-			args: args{ref: "emacs-27.1-rc1"},
-			want: want{version: "27.1-rc1", channel: release.RC, err: ""},
-		},
-		{
-			name: "emacs-27.1-rc2",
-			args: args{ref: "emacs-27.1-rc2"},
-			want: want{version: "27.1-rc2", channel: release.RC, err: ""},
-		},
-		{
-			name: "emacs-27.1.90",
-			args: args{ref: "emacs-27.1.90"},
-			want: want{version: "27.1.90", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-27.1.91",
-			args: args{ref: "emacs-27.1.91"},
-			want: want{version: "27.1.91", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-27.2",
-			args: args{ref: "emacs-27.2"},
-			want: want{version: "27.2", channel: release.Stable, err: ""},
-		},
-		{
-			name: "emacs-27.2-rc1",
-			args: args{ref: "emacs-27.2-rc1"},
-			want: want{version: "27.2-rc1", channel: release.RC, err: ""},
-		},
-		{
-			name: "emacs-27.2-rc2",
-			args: args{ref: "emacs-27.2-rc2"},
-			want: want{version: "27.2-rc2", channel: release.RC, err: ""},
-		},
-		{
-			name: "emacs-28.0.90",
-			args: args{ref: "emacs-28.0.90"},
-			want: want{version: "28.0.90", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-pretest-21.0.100",
-			args: args{ref: "emacs-pretest-21.0.100"},
-			want: want{version: "21.0.100", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-pretest-21.0.106",
-			args: args{ref: "emacs-pretest-21.0.106"},
-			want: want{version: "21.0.106", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-pretest-21.0.90",
-			args: args{ref: "emacs-pretest-21.0.90"},
-			want: want{version: "21.0.90", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-pretest-21.0.99",
-			args: args{ref: "emacs-pretest-21.0.99"},
-			want: want{version: "21.0.99", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-pretest-22.0.90",
-			args: args{ref: "emacs-pretest-22.0.90"},
-			want: want{version: "22.0.90", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-pretest-22.0.99",
-			args: args{ref: "emacs-pretest-22.0.99"},
-			want: want{version: "22.0.99", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-pretest-22.0.990",
-			args: args{ref: "emacs-pretest-22.0.990"},
-			want: want{version: "22.0.990", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-pretest-22.1.90",
-			args: args{ref: "emacs-pretest-22.1.90"},
-			want: want{version: "22.1.90", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-pretest-22.2.90",
-			args: args{ref: "emacs-pretest-22.2.90"},
-			want: want{version: "22.2.90", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-pretest-23.0.90",
-			args: args{ref: "emacs-pretest-23.0.90"},
-			want: want{version: "23.0.90", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-pretest-23.1.90",
-			args: args{ref: "emacs-pretest-23.1.90"},
-			want: want{version: "23.1.90", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-pretest-23.2.90",
-			args: args{ref: "emacs-pretest-23.2.90"},
-			want: want{version: "23.2.90", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-pretest-23.2.91",
-			args: args{ref: "emacs-pretest-23.2.91"},
-			want: want{version: "23.2.91", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-pretest-23.2.93",
-			args: args{ref: "emacs-pretest-23.2.93"},
-			want: want{version: "23.2.93", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-pretest-23.2.93.1",
-			args: args{ref: "emacs-pretest-23.2.93.1"},
-			want: want{version: "23.2.93.1", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-pretest-23.3.90",
-			args: args{ref: "emacs-pretest-23.3.90"},
-			want: want{version: "23.3.90", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-pretest-24.0.05",
-			args: args{ref: "emacs-pretest-24.0.05"},
-			want: want{version: "24.0.05", channel: release.Pretest, err: ""},
-		},
-		{
-			name: "emacs-pretest-24.0.90",
-			args: args{ref: "emacs-pretest-24.0.90"},
-			want: want{version: "24.0.90", channel: release.Pretest, err: ""},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, gotChannel, err := parseGitRef(tt.args.ref)
-
-			assert.Equal(t, tt.want.version, got)
-			assert.Equal(t, tt.want.channel, gotChannel)
-
-			if tt.want.err == "" {
-				assert.NoError(t, err)
-			} else {
-				assert.EqualError(t, err, tt.want.err)
-			}
-		})
-	}
-}
--- a/pkg/plan/plan.go
+++ b/pkg/plan/plan.go
@@ -7,7 +7,6 @@ import (
 	"os"

 	"github.com/jimeh/build-emacs-for-macos/pkg/osinfo"
-	"github.com/jimeh/build-emacs-for-macos/pkg/release"
 	"github.com/jimeh/build-emacs-for-macos/pkg/source"
 	"gopkg.in/yaml.v3"
 )
@@ -79,11 +78,10 @@ type Build struct {
 }

 type Release struct {
-	Name       string          `yaml:"name" json:"name"`
-	Title      string          `yaml:"title,omitempty" json:"title,omitempty"`
-	Draft      bool            `yaml:"draft,omitempty" json:"draft,omitempty"`
-	Prerelease bool            `yaml:"prerelease,omitempty" json:"prerelease,omitempty"`
-	Channel    release.Channel `yaml:"channel,omitempty" json:"channel,omitempty"`
+	Name       string `yaml:"name" json:"name"`
+	Title      string `yaml:"title,omitempty" json:"title,omitempty"`
+	Draft      bool   `yaml:"draft,omitempty" json:"draft,omitempty"`
+	Prerelease bool   `yaml:"prerelease,omitempty" json:"prerelease,omitempty"`
 }

 type Output struct {
--- a/pkg/release/channel.go
+++ b/pkg/release/channel.go
@@ -1,11 +0,0 @@
-package release
-
-type Channel string
-
-// Release channels
-const (
-	Stable  Channel = "stable"
-	RC      Channel = "release-candidate"
-	Pretest Channel = "pretest"
-	Nightly Channel = "nightly"
-)
--- a/pkg/release/version.go
+++ b/pkg/release/version.go
@@ -4,7 +4,6 @@ import (
 	"errors"
 	"fmt"
 	"regexp"
-	"strings"
 )

 // Errors
@@ -19,7 +18,7 @@ var (

 var (
 	stableVersion = regexp.MustCompile(`^\d+\.\d+(?:[a-z]+)?$`)
-	stableGitRef  = regexp.MustCompile(`^emacs-(\d+\.\d+(?:[a-z]+)?)$`)
+	stableGetRef  = regexp.MustCompile(`^emacs-(\d+\.\d+(?:[a-z]+)?)$`)
 )

 func VersionToName(version string) (string, error) {
@@ -27,8 +26,7 @@ func VersionToName(version string) (string, error) {
 		return "", ErrEmptyVersion
 	}

-	if stableVersion.MatchString(version) ||
-		strings.HasSuffix(version, "-pretest") {
+	if stableVersion.MatchString(version) {
 		return "Emacs-" + version, nil
 	}

@@ -36,7 +34,7 @@ func VersionToName(version string) (string, error) {
 }

 func GitRefToStableVersion(ref string) (string, error) {
-	if m := stableGitRef.FindStringSubmatch(ref); len(m) > 1 {
+	if m := stableGetRef.FindStringSubmatch(ref); len(m) > 1 {
 		return m[1], nil
 	}

--- a/pkg/repository/repository.go
+++ b/pkg/repository/repository.go
@@ -128,15 +128,3 @@ func (s *Repository) ActionRunURL(runID string) string {
 		return ""
 	}
 }
-
-func (s *Repository) ReleaseURL(releaseName string) string {
-	if releaseName == "" {
-		return ""
-	}
-	switch s.Type {
-	case GitHub:
-		return GitHubBaseURL + s.Source + "/releases/tag/" + releaseName
-	default:
-		return ""
-	}
-}
--- a/pkg/repository/repository_test.go
+++ b/pkg/repository/repository_test.go
@@ -1,54 +0,0 @@
-package repository
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestRepository_ReleaseURL(t *testing.T) {
-	type fields struct {
-		Type   Type
-		Source string
-	}
-	type args struct {
-		releaseName string
-	}
-	tests := []struct {
-		name   string
-		fields fields
-		args   args
-		want   string
-	}{
-		{
-			name:   "empty name",
-			fields: fields{Type: GitHub, Source: "foo/bar"},
-			args:   args{releaseName: ""},
-			want:   "",
-		},
-		{
-			name:   "GitHub, foo/bar, v1.0.0",
-			fields: fields{Type: GitHub, Source: "foo/bar"},
-			args:   args{releaseName: "v1.0.0"},
-			want:   "https://github.com/foo/bar/releases/tag/v1.0.0",
-		},
-		{
-			name:   "Not GitHub, foo/bar, v1.0.0",
-			fields: fields{Type: Type("oops"), Source: "foo/bar"},
-			args:   args{releaseName: "v1.0.0"},
-			want:   "",
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			repo := &Repository{
-				Type:   tt.fields.Type,
-				Source: tt.fields.Source,
-			}
-
-			got := repo.ReleaseURL(tt.args.releaseName)
-
-			assert.Equal(t, tt.want, got)
-		})
-	}
-}
--- a/pkg/sanitize/string.go
+++ b/pkg/sanitize/string.go
@@ -1,9 +0,0 @@
-package sanitize
-
-import "regexp"
-
-var nonAlphaNum = regexp.MustCompile(`[^\w_-]+`)
-
-func String(s string) string {
-	return nonAlphaNum.ReplaceAllString(s, "-")
-}
--- a/pkg/sign/entitlements.go
+++ b/pkg/sign/entitlements.go
@@ -11,11 +11,14 @@ import (
 // DefaultEmacsEntitlements is the default set of entitlements application
 // bundles are signed with if no entitlements are provided.
 var DefaultEmacsEntitlements = []string{
-	"com.apple.security.cs.allow-jit",
-	"com.apple.security.network.client",
-	"com.apple.security.cs.disable-library-validation",
-	"com.apple.security.cs.allow-dyld-environment-variables",
+	"com.apple.developer.mail-client",
+	"com.apple.developer.web-browser",
 	"com.apple.security.automation.apple-events",
+	"com.apple.security.cs.allow-dyld-environment-variables",
+	"com.apple.security.cs.allow-jit",
+	"com.apple.security.cs.disable-library-validation",
+	"com.apple.security.network.client",
+	"com.apple.security.network.server",
 }

 //go:embed entitlements.tpl
--- a/pkg/sign/entitlements_test.go
+++ b/pkg/sign/entitlements_test.go
@@ -47,11 +47,14 @@ var entitlementsTestCases = []struct {
 	{
 		name: "many",
 		entitlements: Entitlements{
-			"com.apple.security.cs.allow-jit",
-			"com.apple.security.network.client",
-			"com.apple.security.cs.disable-library-validation",
-			"com.apple.security.cs.allow-dyld-environment-variables",
+			"com.apple.developer.mail-client",
+			"com.apple.developer.web-browser",
 			"com.apple.security.automation.apple-events",
+			"com.apple.security.cs.allow-dyld-environment-variables",
+			"com.apple.security.cs.allow-jit",
+			"com.apple.security.cs.disable-library-validation",
+			"com.apple.security.network.client",
+			"com.apple.security.network.server",
 		},
 		//nolint:lll
 		want: undent.String(`
@@ -59,15 +62,21 @@ var entitlementsTestCases = []struct {
            <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
            <plist version="1.0">
              <dict>
-                <key>com.apple.security.cs.allow-jit</key>
+                <key>com.apple.developer.mail-client</key>
                <true/>
-                <key>com.apple.security.network.client</key>
+                <key>com.apple.developer.web-browser</key>
                <true/>
-                <key>com.apple.security.cs.disable-library-validation</key>
+                <key>com.apple.security.automation.apple-events</key>
                <true/>
                <key>com.apple.security.cs.allow-dyld-environment-variables</key>
                <true/>
-                <key>com.apple.security.automation.apple-events</key>
+                <key>com.apple.security.cs.allow-jit</key>
+                <true/>
+                <key>com.apple.security.cs.disable-library-validation</key>
+                <true/>
+                <key>com.apple.security.network.client</key>
+                <true/>
+                <key>com.apple.security.network.server</key>
                <true/>
              </dict>
            </plist>`,
@@ -78,11 +87,14 @@ var entitlementsTestCases = []struct {
 func TestDefaultEmacsEntitlements(t *testing.T) {
 	assert.Equal(t,
 		[]string{
-			"com.apple.security.cs.allow-jit",
-			"com.apple.security.network.client",
-			"com.apple.security.cs.disable-library-validation",
-			"com.apple.security.cs.allow-dyld-environment-variables",
+			"com.apple.developer.mail-client",
+			"com.apple.developer.web-browser",
 			"com.apple.security.automation.apple-events",
+			"com.apple.security.cs.allow-dyld-environment-variables",
+			"com.apple.security.cs.allow-jit",
+			"com.apple.security.cs.disable-library-validation",
+			"com.apple.security.network.client",
+			"com.apple.security.network.server",
 		},
 		DefaultEmacsEntitlements,
 	)
Author	SHA1	Message	Date
Jim Myhrberg	876388f686	fix(signing): remove entitlements which I believe caused the app to not launch	2021-11-28 13:43:34 +00:00
Jim Myhrberg	1be824cc49	feat(signing); add a number of additional entitlements The list of additional entitlements have been picked mostly on a best-guess basis of what's reasonable.	2021-11-27 23:55:30 +00:00