Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rpm2docserv for openSUSE:Factory checked in at 2024-03-20 21:18:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpm2docserv (Old) and /work/SRC/openSUSE:Factory/.rpm2docserv.new.1905 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpm2docserv" Wed Mar 20 21:18:34 2024 rev:15 rq:1159841 version:20240320.aa59b30 Changes: -------- --- /work/SRC/openSUSE:Factory/rpm2docserv/rpm2docserv.changes 2023-03-15 18:56:31.257025940 +0100 +++ /work/SRC/openSUSE:Factory/.rpm2docserv.new.1905/rpm2docserv.changes 2024-03-20 21:21:50.218559473 +0100 @@ -1,0 +2,6 @@ +Wed Mar 20 09:39:50 UTC 2024 - ku...@suse.com + +- Update to version 20240320.aa59b30: + * Switch to google.golang.org/protobuf + +------------------------------------------------------------------- Old: ---- rpm2docserv-20230308.4ed55cf.tar.gz New: ---- rpm2docserv-20240320.aa59b30.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpm2docserv.spec ++++++ --- /var/tmp/diff_new_pack.elgtVV/_old 2024-03-20 21:21:51.766616341 +0100 +++ /var/tmp/diff_new_pack.elgtVV/_new 2024-03-20 21:21:51.766616341 +0100 @@ -1,7 +1,7 @@ # # spec file for package rpm2docserv # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ %endif Name: rpm2docserv -Version: 20230308.4ed55cf +Version: 20240320.aa59b30 Release: 0 Summary: Make manpages from RPMs accessible in a web browser License: Apache-2.0 @@ -30,7 +30,7 @@ Source1: vendor.tar.gz BuildRequires: sysuser-shadow BuildRequires: sysuser-tools -BuildRequires: golang(API) >= 1.19 +BuildRequires: golang(API) >= 1.21 Requires: /usr/bin/mandoc Requires: cpio # To re-create: ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.elgtVV/_old 2024-03-20 21:21:51.806617811 +0100 +++ /var/tmp/diff_new_pack.elgtVV/_new 2024-03-20 21:21:51.810617958 +0100 @@ -1,7 +1,7 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/thkukuk/rpm2docserv.git</param> - <param name="changesrevision">4ed55cfb75c233652ea5801c7768e0e2def705b0</param></service> + <param name="changesrevision">aa59b3096e25a6ef1b00f48feb5cb5ea755b00bd</param></service> </servicedata> (No newline at EOF) ++++++ rpm2docserv-20230308.4ed55cf.tar.gz -> rpm2docserv-20240320.aa59b30.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpm2docserv-20230308.4ed55cf/Makefile new/rpm2docserv-20240320.aa59b30/Makefile --- old/rpm2docserv-20230308.4ed55cf/Makefile 2023-03-08 11:03:03.000000000 +0100 +++ new/rpm2docserv-20240320.aa59b30/Makefile 2024-03-20 10:18:25.000000000 +0100 @@ -22,7 +22,7 @@ api: ## Auto-generate grpc go sources @protoc -I pkg/proto/ \ - --go_out=plugins=grpc:pkg/proto \ + --go_out=pkg/proto \ pkg/proto/index.proto bundle: ## Generate embedded files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpm2docserv-20230308.4ed55cf/cmd/rpm2docserv/writeindex.go new/rpm2docserv-20240320.aa59b30/cmd/rpm2docserv/writeindex.go --- old/rpm2docserv-20230308.4ed55cf/cmd/rpm2docserv/writeindex.go 2023-03-08 11:03:03.000000000 +0100 +++ new/rpm2docserv-20240320.aa59b30/cmd/rpm2docserv/writeindex.go 2024-03-20 10:18:25.000000000 +0100 @@ -6,7 +6,7 @@ pb "github.com/thkukuk/rpm2docserv/pkg/proto" "github.com/thkukuk/rpm2docserv/pkg/write" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" ) // writeIndex serializes an index for the redirect package (used in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpm2docserv-20230308.4ed55cf/go.mod new/rpm2docserv-20240320.aa59b30/go.mod --- old/rpm2docserv-20230308.4ed55cf/go.mod 2023-03-08 11:03:03.000000000 +0100 +++ new/rpm2docserv-20240320.aa59b30/go.mod 2024-03-20 10:18:25.000000000 +0100 @@ -1,14 +1,13 @@ module github.com/thkukuk/rpm2docserv -go 1.18 +go 1.21 require ( - github.com/golang/protobuf v1.5.2 github.com/knqyf263/go-rpm-version v0.0.0-20220614171824-631e686d1075 - golang.org/x/net v0.8.0 - golang.org/x/sync v0.1.0 - golang.org/x/text v0.8.0 + golang.org/x/net v0.22.0 + golang.org/x/sync v0.6.0 + golang.org/x/text v0.14.0 gopkg.in/yaml.v3 v3.0.1 ) -require google.golang.org/protobuf v1.28.1 // indirect +require google.golang.org/protobuf v1.33.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpm2docserv-20230308.4ed55cf/go.sum new/rpm2docserv-20240320.aa59b30/go.sum --- old/rpm2docserv-20230308.4ed55cf/go.sum 2023-03-08 11:03:03.000000000 +0100 +++ new/rpm2docserv-20240320.aa59b30/go.sum 2024-03-20 10:18:25.000000000 +0100 @@ -1,26 +1,17 @@ -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/knqyf263/go-rpm-version v0.0.0-20220614171824-631e686d1075 h1:aC6MEAs3PE3lWD7lqrJfDxHd6hcced9R4JTZu85cJwU= github.com/knqyf263/go-rpm-version v0.0.0-20220614171824-631e686d1075/go.mod h1:i4sF0l1fFnY1aiw08QQSwVAFxHEm311Me3WsU/X7nL0= -golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw= -golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= -golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= -golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= -golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k= -golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= -golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= -google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpm2docserv-20230308.4ed55cf/pkg/proto/generate.go new/rpm2docserv-20240320.aa59b30/pkg/proto/generate.go --- old/rpm2docserv-20230308.4ed55cf/pkg/proto/generate.go 2023-03-08 11:03:03.000000000 +0100 +++ new/rpm2docserv-20240320.aa59b30/pkg/proto/generate.go 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -package proto - -//go:generate protoc index.proto --go_out=. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpm2docserv-20230308.4ed55cf/pkg/proto/index.pb.go new/rpm2docserv-20240320.aa59b30/pkg/proto/index.pb.go --- old/rpm2docserv-20230308.4ed55cf/pkg/proto/index.pb.go 2023-03-08 11:03:03.000000000 +0100 +++ new/rpm2docserv-20240320.aa59b30/pkg/proto/index.pb.go 2024-03-20 10:18:25.000000000 +0100 @@ -1,178 +1,282 @@ // Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.32.0 +// protoc v4.25.1 // source: index.proto package proto -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) type IndexEntry struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - Suite string `protobuf:"bytes,2,opt,name=suite,proto3" json:"suite,omitempty"` - Binarypkg string `protobuf:"bytes,3,opt,name=binarypkg,proto3" json:"binarypkg,omitempty"` - Section string `protobuf:"bytes,4,opt,name=section,proto3" json:"section,omitempty"` - Language string `protobuf:"bytes,5,opt,name=language,proto3" json:"language,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Suite string `protobuf:"bytes,2,opt,name=suite,proto3" json:"suite,omitempty"` + Binarypkg string `protobuf:"bytes,3,opt,name=binarypkg,proto3" json:"binarypkg,omitempty"` + Section string `protobuf:"bytes,4,opt,name=section,proto3" json:"section,omitempty"` + Language string `protobuf:"bytes,5,opt,name=language,proto3" json:"language,omitempty"` +} + +func (x *IndexEntry) Reset() { + *x = IndexEntry{} + if protoimpl.UnsafeEnabled { + mi := &file_index_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } -func (m *IndexEntry) Reset() { *m = IndexEntry{} } -func (m *IndexEntry) String() string { return proto.CompactTextString(m) } -func (*IndexEntry) ProtoMessage() {} -func (*IndexEntry) Descriptor() ([]byte, []int) { - return fileDescriptor_index_16ff3411c927eb80, []int{0} -} -func (m *IndexEntry) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_IndexEntry.Unmarshal(m, b) -} -func (m *IndexEntry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_IndexEntry.Marshal(b, m, deterministic) +func (x *IndexEntry) String() string { + return protoimpl.X.MessageStringOf(x) } -func (dst *IndexEntry) XXX_Merge(src proto.Message) { - xxx_messageInfo_IndexEntry.Merge(dst, src) -} -func (m *IndexEntry) XXX_Size() int { - return xxx_messageInfo_IndexEntry.Size(m) -} -func (m *IndexEntry) XXX_DiscardUnknown() { - xxx_messageInfo_IndexEntry.DiscardUnknown(m) + +func (*IndexEntry) ProtoMessage() {} + +func (x *IndexEntry) ProtoReflect() protoreflect.Message { + mi := &file_index_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) } -var xxx_messageInfo_IndexEntry proto.InternalMessageInfo +// Deprecated: Use IndexEntry.ProtoReflect.Descriptor instead. +func (*IndexEntry) Descriptor() ([]byte, []int) { + return file_index_proto_rawDescGZIP(), []int{0} +} -func (m *IndexEntry) GetName() string { - if m != nil { - return m.Name +func (x *IndexEntry) GetName() string { + if x != nil { + return x.Name } return "" } -func (m *IndexEntry) GetSuite() string { - if m != nil { - return m.Suite +func (x *IndexEntry) GetSuite() string { + if x != nil { + return x.Suite } return "" } -func (m *IndexEntry) GetBinarypkg() string { - if m != nil { - return m.Binarypkg +func (x *IndexEntry) GetBinarypkg() string { + if x != nil { + return x.Binarypkg } return "" } -func (m *IndexEntry) GetSection() string { - if m != nil { - return m.Section +func (x *IndexEntry) GetSection() string { + if x != nil { + return x.Section } return "" } -func (m *IndexEntry) GetLanguage() string { - if m != nil { - return m.Language +func (x *IndexEntry) GetLanguage() string { + if x != nil { + return x.Language } return "" } type Index struct { - Entry []*IndexEntry `protobuf:"bytes,1,rep,name=entry,proto3" json:"entry,omitempty"` - Language []string `protobuf:"bytes,2,rep,name=language,proto3" json:"language,omitempty"` - Suite map[string]string `protobuf:"bytes,3,rep,name=suite,proto3" json:"suite,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - Section []string `protobuf:"bytes,4,rep,name=section,proto3" json:"section,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Entry []*IndexEntry `protobuf:"bytes,1,rep,name=entry,proto3" json:"entry,omitempty"` + Language []string `protobuf:"bytes,2,rep,name=language,proto3" json:"language,omitempty"` + Suite map[string]string `protobuf:"bytes,3,rep,name=suite,proto3" json:"suite,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Section []string `protobuf:"bytes,4,rep,name=section,proto3" json:"section,omitempty"` +} + +func (x *Index) Reset() { + *x = Index{} + if protoimpl.UnsafeEnabled { + mi := &file_index_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } -func (m *Index) Reset() { *m = Index{} } -func (m *Index) String() string { return proto.CompactTextString(m) } -func (*Index) ProtoMessage() {} -func (*Index) Descriptor() ([]byte, []int) { - return fileDescriptor_index_16ff3411c927eb80, []int{1} +func (x *Index) String() string { + return protoimpl.X.MessageStringOf(x) } -func (m *Index) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Index.Unmarshal(m, b) -} -func (m *Index) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Index.Marshal(b, m, deterministic) -} -func (dst *Index) XXX_Merge(src proto.Message) { - xxx_messageInfo_Index.Merge(dst, src) -} -func (m *Index) XXX_Size() int { - return xxx_messageInfo_Index.Size(m) -} -func (m *Index) XXX_DiscardUnknown() { - xxx_messageInfo_Index.DiscardUnknown(m) + +func (*Index) ProtoMessage() {} + +func (x *Index) ProtoReflect() protoreflect.Message { + mi := &file_index_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) } -var xxx_messageInfo_Index proto.InternalMessageInfo +// Deprecated: Use Index.ProtoReflect.Descriptor instead. +func (*Index) Descriptor() ([]byte, []int) { + return file_index_proto_rawDescGZIP(), []int{1} +} -func (m *Index) GetEntry() []*IndexEntry { - if m != nil { - return m.Entry +func (x *Index) GetEntry() []*IndexEntry { + if x != nil { + return x.Entry } return nil } -func (m *Index) GetLanguage() []string { - if m != nil { - return m.Language +func (x *Index) GetLanguage() []string { + if x != nil { + return x.Language } return nil } -func (m *Index) GetSuite() map[string]string { - if m != nil { - return m.Suite +func (x *Index) GetSuite() map[string]string { + if x != nil { + return x.Suite } return nil } -func (m *Index) GetSection() []string { - if m != nil { - return m.Section +func (x *Index) GetSection() []string { + if x != nil { + return x.Section } return nil } -func init() { - proto.RegisterType((*IndexEntry)(nil), "proto.IndexEntry") - proto.RegisterType((*Index)(nil), "proto.Index") - proto.RegisterMapType((map[string]string)(nil), "proto.Index.SuiteEntry") -} - -func init() { proto.RegisterFile("index.proto", fileDescriptor_index_16ff3411c927eb80) } - -var fileDescriptor_index_16ff3411c927eb80 = []byte{ - // 235 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x90, 0x3d, 0x4e, 0xc4, 0x30, - 0x10, 0x85, 0xe5, 0x78, 0x0d, 0xec, 0x6c, 0x03, 0x23, 0x24, 0xac, 0x15, 0x45, 0xb4, 0x0d, 0xdb, - 0x90, 0x02, 0x9a, 0x88, 0x9e, 0x82, 0x36, 0x9c, 0xc0, 0x01, 0x2b, 0xb2, 0x12, 0x9c, 0x28, 0x71, - 0x10, 0xb9, 0x02, 0x97, 0xe3, 0x4a, 0xc8, 0xe3, 0xfc, 0x56, 0x9e, 0x37, 0xcf, 0x7a, 0xfe, 0xfc, - 0xe0, 0x60, 0xec, 0xa7, 0xfe, 0x49, 0x9a, 0xb6, 0x76, 0x35, 0x0a, 0x3a, 0x4e, 0xbf, 0x0c, 0xe0, - 0xcd, 0xaf, 0x5f, 0xad, 0x6b, 0x07, 0x44, 0xd8, 0x59, 0xf5, 0xa5, 0x25, 0x8b, 0xd9, 0x79, 0x9f, - 0xd1, 0x8c, 0xb7, 0x20, 0xba, 0xde, 0x38, 0x2d, 0x23, 0x5a, 0x06, 0x81, 0xf7, 0xb0, 0xcf, 0x8d, - 0x55, 0xed, 0xd0, 0x94, 0x85, 0xe4, 0xe4, 0x2c, 0x0b, 0x94, 0x70, 0xd9, 0xe9, 0x0f, 0x67, 0x6a, - 0x2b, 0x77, 0xe4, 0x4d, 0x12, 0x8f, 0x70, 0x55, 0x29, 0x5b, 0xf4, 0xaa, 0xd0, 0x52, 0x90, 0x35, - 0xeb, 0xd3, 0x1f, 0x03, 0x41, 0x30, 0xf8, 0x00, 0x42, 0x7b, 0x20, 0xc9, 0x62, 0x7e, 0x3e, 0x3c, - 0xdd, 0x04, 0xe8, 0x64, 0x21, 0xcd, 0x82, 0xbf, 0x89, 0x8b, 0x62, 0xbe, 0x8e, 0xc3, 0xc7, 0x09, - 0x9c, 0x53, 0xc8, 0xdd, 0x3a, 0x24, 0x79, 0xf7, 0xce, 0x18, 0x15, 0x7e, 0xb4, 0x61, 0xe6, 0x2b, - 0xe6, 0x63, 0x0a, 0xb0, 0x5c, 0xc7, 0x6b, 0xe0, 0xa5, 0x1e, 0xc6, 0x8a, 0xfc, 0xe8, 0x1b, 0xfa, - 0x56, 0x55, 0x3f, 0x37, 0x44, 0xe2, 0x25, 0x4a, 0x59, 0x7e, 0x41, 0x4f, 0x3e, 0xff, 0x07, 0x00, - 0x00, 0xff, 0xff, 0xe2, 0xe5, 0x32, 0xf9, 0x7b, 0x01, 0x00, 0x00, +var File_index_proto protoreflect.FileDescriptor + +var file_index_proto_rawDesc = []byte{ + 0x0a, 0x0b, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x05, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x8a, 0x01, 0x0a, 0x0a, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x75, 0x69, 0x74, 0x65, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x75, 0x69, 0x74, 0x65, 0x12, 0x1c, 0x0a, + 0x09, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x70, 0x6b, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x09, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x70, 0x6b, 0x67, 0x12, 0x18, 0x0a, 0x07, 0x73, + 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x65, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, + 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6c, 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, + 0x65, 0x22, 0xcf, 0x01, 0x0a, 0x05, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x27, 0x0a, 0x05, 0x65, + 0x6e, 0x74, 0x72, 0x79, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x2e, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x65, + 0x6e, 0x74, 0x72, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, + 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x6c, 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, + 0x12, 0x2d, 0x0a, 0x05, 0x73, 0x75, 0x69, 0x74, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x17, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x2e, 0x53, 0x75, + 0x69, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x73, 0x75, 0x69, 0x74, 0x65, 0x12, + 0x18, 0x0a, 0x07, 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, + 0x52, 0x07, 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x38, 0x0a, 0x0a, 0x53, 0x75, 0x69, + 0x74, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, + 0x02, 0x38, 0x01, 0x42, 0x2a, 0x5a, 0x28, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, + 0x6d, 0x2f, 0x74, 0x68, 0x6b, 0x75, 0x6b, 0x75, 0x6b, 0x2f, 0x72, 0x70, 0x6d, 0x32, 0x64, 0x6f, + 0x63, 0x73, 0x65, 0x72, 0x76, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_index_proto_rawDescOnce sync.Once + file_index_proto_rawDescData = file_index_proto_rawDesc +) + +func file_index_proto_rawDescGZIP() []byte { + file_index_proto_rawDescOnce.Do(func() { + file_index_proto_rawDescData = protoimpl.X.CompressGZIP(file_index_proto_rawDescData) + }) + return file_index_proto_rawDescData +} + +var file_index_proto_msgTypes = make([]protoimpl.MessageInfo, 3) +var file_index_proto_goTypes = []interface{}{ + (*IndexEntry)(nil), // 0: proto.IndexEntry + (*Index)(nil), // 1: proto.Index + nil, // 2: proto.Index.SuiteEntry +} +var file_index_proto_depIdxs = []int32{ + 0, // 0: proto.Index.entry:type_name -> proto.IndexEntry + 2, // 1: proto.Index.suite:type_name -> proto.Index.SuiteEntry + 2, // [2:2] is the sub-list for method output_type + 2, // [2:2] is the sub-list for method input_type + 2, // [2:2] is the sub-list for extension type_name + 2, // [2:2] is the sub-list for extension extendee + 0, // [0:2] is the sub-list for field type_name +} + +func init() { file_index_proto_init() } +func file_index_proto_init() { + if File_index_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_index_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*IndexEntry); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_index_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*Index); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_index_proto_rawDesc, + NumEnums: 0, + NumMessages: 3, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_index_proto_goTypes, + DependencyIndexes: file_index_proto_depIdxs, + MessageInfos: file_index_proto_msgTypes, + }.Build() + File_index_proto = out.File + file_index_proto_rawDesc = nil + file_index_proto_goTypes = nil + file_index_proto_depIdxs = nil } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpm2docserv-20230308.4ed55cf/pkg/proto/index.proto new/rpm2docserv-20240320.aa59b30/pkg/proto/index.proto --- old/rpm2docserv-20230308.4ed55cf/pkg/proto/index.proto 2023-03-08 11:03:03.000000000 +0100 +++ new/rpm2docserv-20240320.aa59b30/pkg/proto/index.proto 2024-03-20 10:18:25.000000000 +0100 @@ -1,5 +1,7 @@ syntax = "proto3"; +option go_package = "github.com/thkukuk/rpm2docserv/pkg/proto"; + package proto; message IndexEntry { @@ -15,4 +17,4 @@ repeated string language = 2; map<string,string> suite = 3; repeated string section = 4; -} \ No newline at end of file +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpm2docserv-20230308.4ed55cf/pkg/redirect/redirect.go new/rpm2docserv-20240320.aa59b30/pkg/redirect/redirect.go --- old/rpm2docserv-20230308.4ed55cf/pkg/redirect/redirect.go 2023-03-08 11:03:03.000000000 +0100 +++ new/rpm2docserv-20240320.aa59b30/pkg/redirect/redirect.go 2024-03-20 10:18:25.000000000 +0100 @@ -11,7 +11,7 @@ pb "github.com/thkukuk/rpm2docserv/pkg/proto" "github.com/thkukuk/rpm2docserv/pkg/tag" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "golang.org/x/text/language" ) ++++++ vendor.tar.gz ++++++ ++++ 19590 lines of diff (skipped)