Skip to content

Commit 0360c92

Browse files
miloschwartzmiloschwartz
authored
Merge pull request #29 from fosrl/dev
Dev
2 parents cdd0fec + c7a132d commit 0360c92

3 files changed

Lines changed: 38 additions & 38 deletions

File tree

‎Pangolin.xcodeproj/project.pbxproj‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@
522522
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
523523
CODE_SIGN_ENTITLEMENTS = Pangolin/iOS/Pangolin.entitlements;
524524
CODE_SIGN_STYLE = Automatic;
525-
CURRENT_PROJECT_VERSION = 13;
525+
CURRENT_PROJECT_VERSION = 14;
526526
DEVELOPMENT_TEAM = 4668XHFAHF;
527527
ENABLE_PREVIEWS = YES;
528528
GENERATE_INFOPLIST_FILE = NO;
@@ -539,7 +539,7 @@
539539
"$(inherited)",
540540
"@executable_path/Frameworks",
541541
);
542-
MARKETING_VERSION = 0.6.1;
542+
MARKETING_VERSION = 0.6.2;
543543
OTHER_LDFLAGS = "$(SRCROOT)/PangolinGo/libpangolin_ios_arm64.a";
544544
"OTHER_LDFLAGS[sdk=iphonesimulator*][arch=arm64]" = "$(SRCROOT)/PangolinGo/libpangolin_ios_sim_arm64.a";
545545
"OTHER_LDFLAGS[sdk=iphonesimulator*][arch=x86_64]" = "$(SRCROOT)/PangolinGo/libpangolin_ios_sim_x86_64.a";
@@ -568,7 +568,7 @@
568568
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
569569
CODE_SIGN_ENTITLEMENTS = Pangolin/iOS/Pangolin.entitlements;
570570
CODE_SIGN_STYLE = Automatic;
571-
CURRENT_PROJECT_VERSION = 13;
571+
CURRENT_PROJECT_VERSION = 14;
572572
DEVELOPMENT_TEAM = 4668XHFAHF;
573573
ENABLE_PREVIEWS = YES;
574574
GENERATE_INFOPLIST_FILE = NO;
@@ -585,7 +585,7 @@
585585
"$(inherited)",
586586
"@executable_path/Frameworks",
587587
);
588-
MARKETING_VERSION = 0.6.1;
588+
MARKETING_VERSION = 0.6.2;
589589
OTHER_LDFLAGS = "$(SRCROOT)/PangolinGo/libpangolin_ios_arm64.a";
590590
"OTHER_LDFLAGS[sdk=iphonesimulator*][arch=arm64]" = "$(SRCROOT)/PangolinGo/libpangolin_ios_sim_arm64.a";
591591
"OTHER_LDFLAGS[sdk=iphonesimulator*][arch=x86_64]" = "$(SRCROOT)/PangolinGo/libpangolin_ios_sim_x86_64.a";
@@ -612,7 +612,7 @@
612612
buildSettings = {
613613
CODE_SIGN_ENTITLEMENTS = PacketTunnel/iOS/PacketTunnel.entitlements;
614614
CODE_SIGN_STYLE = Automatic;
615-
CURRENT_PROJECT_VERSION = 13;
615+
CURRENT_PROJECT_VERSION = 14;
616616
DEVELOPMENT_TEAM = 4668XHFAHF;
617617
GENERATE_INFOPLIST_FILE = NO;
618618
INFOPLIST_FILE = PacketTunnel/iOS/Info.plist;
@@ -628,7 +628,7 @@
628628
"$(inherited)",
629629
"$(PROJECT_DIR)/PangolinGo",
630630
);
631-
MARKETING_VERSION = 0.6.1;
631+
MARKETING_VERSION = 0.6.2;
632632
OTHER_LDFLAGS = "$(SRCROOT)/PangolinGo/libpangolin_ios_arm64.a";
633633
"OTHER_LDFLAGS[sdk=iphonesimulator*][arch=arm64]" = "$(SRCROOT)/PangolinGo/libpangolin_ios_sim_arm64.a";
634634
"OTHER_LDFLAGS[sdk=iphonesimulator*][arch=x86_64]" = "$(SRCROOT)/PangolinGo/libpangolin_ios_sim_x86_64.a";
@@ -655,7 +655,7 @@
655655
buildSettings = {
656656
CODE_SIGN_ENTITLEMENTS = PacketTunnel/iOS/PacketTunnel.entitlements;
657657
CODE_SIGN_STYLE = Automatic;
658-
CURRENT_PROJECT_VERSION = 13;
658+
CURRENT_PROJECT_VERSION = 14;
659659
DEVELOPMENT_TEAM = 4668XHFAHF;
660660
GENERATE_INFOPLIST_FILE = NO;
661661
INFOPLIST_FILE = PacketTunnel/iOS/Info.plist;
@@ -671,7 +671,7 @@
671671
"$(inherited)",
672672
"$(PROJECT_DIR)/PangolinGo",
673673
);
674-
MARKETING_VERSION = 0.6.1;
674+
MARKETING_VERSION = 0.6.2;
675675
OTHER_LDFLAGS = "$(SRCROOT)/PangolinGo/libpangolin_ios_arm64.a";
676676
"OTHER_LDFLAGS[sdk=iphonesimulator*][arch=arm64]" = "$(SRCROOT)/PangolinGo/libpangolin_ios_sim_arm64.a";
677677
"OTHER_LDFLAGS[sdk=iphonesimulator*][arch=x86_64]" = "$(SRCROOT)/PangolinGo/libpangolin_ios_sim_x86_64.a";
@@ -826,7 +826,7 @@
826826
CODE_SIGN_IDENTITY = "Apple Development";
827827
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
828828
CODE_SIGN_STYLE = Manual;
829-
CURRENT_PROJECT_VERSION = 10;
829+
CURRENT_PROJECT_VERSION = 11;
830830
DEAD_CODE_STRIPPING = YES;
831831
DEVELOPMENT_TEAM = "";
832832
"DEVELOPMENT_TEAM[sdk=macosx*]" = 4668XHFAHF;
@@ -866,7 +866,7 @@
866866
"$(SRCROOT)/PangolinGo",
867867
);
868868
MACOSX_DEPLOYMENT_TARGET = 14.0;
869-
MARKETING_VERSION = 0.6.0;
869+
MARKETING_VERSION = 0.6.1;
870870
OTHER_LDFLAGS = "-lpangolin";
871871
PRODUCT_BUNDLE_IDENTIFIER = net.pangolin.Pangolin;
872872
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -896,7 +896,7 @@
896896
CODE_SIGN_IDENTITY = "Apple Development";
897897
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
898898
CODE_SIGN_STYLE = Manual;
899-
CURRENT_PROJECT_VERSION = 10;
899+
CURRENT_PROJECT_VERSION = 11;
900900
DEAD_CODE_STRIPPING = YES;
901901
DEVELOPMENT_TEAM = "";
902902
"DEVELOPMENT_TEAM[sdk=macosx*]" = 4668XHFAHF;
@@ -936,7 +936,7 @@
936936
"$(SRCROOT)/PangolinGo",
937937
);
938938
MACOSX_DEPLOYMENT_TARGET = 14.0;
939-
MARKETING_VERSION = 0.6.0;
939+
MARKETING_VERSION = 0.6.1;
940940
OTHER_LDFLAGS = "-lpangolin";
941941
PRODUCT_BUNDLE_IDENTIFIER = net.pangolin.Pangolin;
942942
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -964,7 +964,7 @@
964964
CODE_SIGN_IDENTITY = "Apple Development";
965965
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
966966
CODE_SIGN_STYLE = Manual;
967-
CURRENT_PROJECT_VERSION = 10;
967+
CURRENT_PROJECT_VERSION = 11;
968968
DEAD_CODE_STRIPPING = YES;
969969
DEVELOPMENT_TEAM = "";
970970
"DEVELOPMENT_TEAM[sdk=macosx*]" = 4668XHFAHF;
@@ -994,7 +994,7 @@
994994
"$(SRCROOT)/PangolinGo",
995995
);
996996
MACOSX_DEPLOYMENT_TARGET = 14.0;
997-
MARKETING_VERSION = 0.6.0;
997+
MARKETING_VERSION = 0.6.1;
998998
OTHER_LDFLAGS = "-lpangolin";
999999
PRODUCT_BUNDLE_IDENTIFIER = net.pangolin.Pangolin.PacketTunnel;
10001000
PRODUCT_NAME = "$(inherited)";
@@ -1021,7 +1021,7 @@
10211021
CODE_SIGN_IDENTITY = "Apple Development";
10221022
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
10231023
CODE_SIGN_STYLE = Manual;
1024-
CURRENT_PROJECT_VERSION = 10;
1024+
CURRENT_PROJECT_VERSION = 11;
10251025
DEAD_CODE_STRIPPING = YES;
10261026
DEVELOPMENT_TEAM = "";
10271027
"DEVELOPMENT_TEAM[sdk=macosx*]" = 4668XHFAHF;
@@ -1051,7 +1051,7 @@
10511051
"$(SRCROOT)/PangolinGo",
10521052
);
10531053
MACOSX_DEPLOYMENT_TARGET = 14.0;
1054-
MARKETING_VERSION = 0.6.0;
1054+
MARKETING_VERSION = 0.6.1;
10551055
OTHER_LDFLAGS = "-lpangolin";
10561056
PRODUCT_BUNDLE_IDENTIFIER = net.pangolin.Pangolin.PacketTunnel;
10571057
PRODUCT_NAME = "$(inherited)";

‎PangolinGo/go.mod‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
module github.com/fosrl/apple
22

3-
go 1.25
3+
go 1.25.0
44

55
require (
6-
github.com/fosrl/newt v1.9.0
7-
github.com/fosrl/olm v1.4.2
6+
github.com/fosrl/newt v1.10.3
7+
github.com/fosrl/olm v1.4.4
88
)
99

1010
require (
@@ -15,14 +15,14 @@ require (
1515
github.com/miekg/dns v1.1.70 // indirect
1616
github.com/vishvananda/netlink v1.3.1 // indirect
1717
github.com/vishvananda/netns v0.0.5 // indirect
18-
golang.org/x/crypto v0.46.0 // indirect
18+
golang.org/x/crypto v0.48.0 // indirect
1919
golang.org/x/exp v0.0.0-20251113190631-e25ba8c21ef6 // indirect
20-
golang.org/x/mod v0.31.0 // indirect
21-
golang.org/x/net v0.48.0 // indirect
20+
golang.org/x/mod v0.32.0 // indirect
21+
golang.org/x/net v0.51.0 // indirect
2222
golang.org/x/sync v0.19.0 // indirect
23-
golang.org/x/sys v0.40.0 // indirect
23+
golang.org/x/sys v0.41.0 // indirect
2424
golang.org/x/time v0.12.0 // indirect
25-
golang.org/x/tools v0.40.0 // indirect
25+
golang.org/x/tools v0.41.0 // indirect
2626
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
2727
golang.zx2c4.com/wireguard v0.0.0-20250521234502-f333402bd9cb // indirect
2828
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20241231184526-a9ab2273dd10 // indirect

‎PangolinGo/go.sum‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
22
github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
3-
github.com/fosrl/newt v1.9.0 h1:66eJMo6fA+YcBTbddxTfNJXNQo1WWKzmn6zPRP5kSDE=
4-
github.com/fosrl/newt v1.9.0/go.mod h1:d1+yYMnKqg4oLqAM9zdbjthjj2FQEVouiACjqU468ck=
5-
github.com/fosrl/olm v1.4.2 h1:IyMbQvWyswaSaCuRDU1WnafImcOSxtRrYaofVeFgw3s=
6-
github.com/fosrl/olm v1.4.2/go.mod h1:aC1oieI0tadd66zY7RDjXT3PPsR54mYS0FYMsHqFqs8=
3+
github.com/fosrl/newt v1.10.3 h1:JO9gFK9LP/w2EeDIn4wU+jKggAFPo06hX5hxFSETqcw=
4+
github.com/fosrl/newt v1.10.3/go.mod h1:iYuuCAG7iabheiogMOX87r61uQN31S39nKxMKRuLS+s=
5+
github.com/fosrl/olm v1.4.4 h1:MoHQO9okqN7NKNtxgAdKsnV70bRzbm4hec6nBHpNic8=
6+
github.com/fosrl/olm v1.4.4/go.mod h1:SxeQNFngDMgwrXpTWjt1gheyoZo2TltmNrQ2vXX7YT4=
77
github.com/godbus/dbus/v5 v5.2.2 h1:TUR3TgtSVDmjiXOgAAyaZbYmIeP3DPkld3jgKGV8mXQ=
88
github.com/godbus/dbus/v5 v5.2.2/go.mod h1:3AAv2+hPq5rdnr5txxxRwiGjPXamgoIHgz9FPBfOp3c=
99
github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
@@ -18,24 +18,24 @@ github.com/vishvananda/netlink v1.3.1 h1:3AEMt62VKqz90r0tmNhog0r/PpWKmrEShJU0wJW
1818
github.com/vishvananda/netlink v1.3.1/go.mod h1:ARtKouGSTGchR8aMwmkzC0qiNPrrWO5JS/XMVl45+b4=
1919
github.com/vishvananda/netns v0.0.5 h1:DfiHV+j8bA32MFM7bfEunvT8IAqQ/NzSJHtcmW5zdEY=
2020
github.com/vishvananda/netns v0.0.5/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
21-
golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU=
22-
golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=
21+
golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts=
22+
golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos=
2323
golang.org/x/exp v0.0.0-20251113190631-e25ba8c21ef6 h1:zfMcR1Cs4KNuomFFgGefv5N0czO2XZpUbxGUy8i8ug0=
2424
golang.org/x/exp v0.0.0-20251113190631-e25ba8c21ef6/go.mod h1:46edojNIoXTNOhySWIWdix628clX9ODXwPsQuG6hsK0=
25-
golang.org/x/mod v0.31.0 h1:HaW9xtz0+kOcWKwli0ZXy79Ix+UW/vOfmWI5QVd2tgI=
26-
golang.org/x/mod v0.31.0/go.mod h1:43JraMp9cGx1Rx3AqioxrbrhNsLl2l/iNAvuBkrezpg=
27-
golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
28-
golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
25+
golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c=
26+
golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU=
27+
golang.org/x/net v0.51.0 h1:94R/GTO7mt3/4wIKpcR5gkGmRLOuE/2hNGeWq/GBIFo=
28+
golang.org/x/net v0.51.0/go.mod h1:aamm+2QF5ogm02fjy5Bb7CQ0WMt1/WVM7FtyaTLlA9Y=
2929
golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
3030
golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
3131
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
3232
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
33-
golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
34-
golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
33+
golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
34+
golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
3535
golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
3636
golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
37-
golang.org/x/tools v0.40.0 h1:yLkxfA+Qnul4cs9QA3KnlFu0lVmd8JJfoq+E41uSutA=
38-
golang.org/x/tools v0.40.0/go.mod h1:Ik/tzLRlbscWpqqMRjyWYDisX8bG13FrdXp3o4Sr9lc=
37+
golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc=
38+
golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg=
3939
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeunTOisW56dUokqW/FOteYJJ/yg=
4040
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI=
4141
golang.zx2c4.com/wireguard v0.0.0-20250521234502-f333402bd9cb h1:whnFRlWMcXI9d+ZbWg+4sHnLp52d5yiIPUxMBSt4X9A=

0 commit comments

Comments
 (0)